def "nu-complete git available upstream" [] { ^git branch -a | lines | each { |line| $line | str replace '\* ' "" | str trim } } def "nu-complete git remotes" [] { ^git remote | lines | each { |line| $line | str trim } } def "nu-complete git log" [] { ^git log --pretty=%h | lines | each { |line| $line | str trim } } # Yield all existing commits in descending chronological order. def "nu-complete git commits all" [] { ^git rev-list --all --remotes --pretty=oneline | lines | parse "{value} {description}" } # Yield commits of current branch only. This is useful for e.g. cut points in # `git rebase`. def "nu-complete git commits current branch" [] { ^git log --pretty="%h %s" | lines | parse "{value} {description}" } # Yield local branches like `main`, `feature/typo_fix` def "nu-complete git local branches" [] { ^git branch | lines | each { |line| $line | str replace '* ' "" | str trim } } # Yield remote branches like `origin/main`, `upstream/feature-a` def "nu-complete git remote branches with prefix" [] { ^git branch -r | lines | parse -r '^\*?(\s*|\s*\S* -> )(?P\S*$)' | get branch | uniq } # Yield remote branches *without* prefix which do not have a local counterpart. # E.g. `upstream/feature-a` as `feature-a` to checkout and track in one command # with `git checkout` or `git switch`. def "nu-complete git remote branches nonlocal without prefix" [] { # Get regex to strip remotes prefixes. It will look like `(origin|upstream)` # for the two remotes `origin` and `upstream`. let remotes_regex = (["(", ((nu-complete git remotes | each {|r| [$r, '/'] | str join}) | str join "|"), ")"] | str join) let local_branches = (nu-complete git local branches) ^git branch -r | lines | parse -r (['^[\* ]+', $remotes_regex, '?(?P\S+)'] | flatten | str join) | get branch | uniq | where {|branch| $branch != "HEAD"} | where {|branch| $branch not-in $local_branches } } def "nu-complete git switch" [] { (nu-complete git local branches) | parse "{value}" | insert description "local branch" | append (nu-complete git remote branches nonlocal without prefix | parse "{value}" | insert description "remote branch") } def "nu-complete git checkout" [] { (nu-complete git local branches) | parse "{value}" | insert description "local branch" | append (nu-complete git remote branches nonlocal without prefix | parse "{value}" | insert description "remote branch") | append (nu-complete git remote branches with prefix | parse "{value}" | insert description "remote branch") | append (nu-complete git commits all) | append (nu-complete git files | where description != "Untracked" | select value) } # Arguments to `git rebase --onto ` def "nu-complete git rebase" [] { (nu-complete git local branches) | parse "{value}" | insert description "local branch" | append (nu-complete git remote branches with prefix | parse "{value}" | insert description "remote branch") | append (nu-complete git commits all) } def "nu-complete git stash-list" [] { git stash list | lines | parse "{value}: {description}" } def "nu-complete git tags" [] { ^git tag | lines } # See `man git-status` under "Short Format" # This is incomplete, but should cover the most common cases. const short_status_descriptions = { ".D": "Deleted" ".M": "Modified" "!" : "Ignored" "?" : "Untracked" "AU": "Staged, not merged" "MD": "Some modifications staged, file deleted in work tree" "MM": "Some modifications staged, some modifications untracked" "R.": "Renamed" "UU": "Both modified (in merge conflict)" } def "nu-complete git files" [] { let relevant_statuses = ["?",".M", "MM", "MD", ".D", "UU"] ^git status -uall --porcelain=2 | lines | each { |$it| if $it starts-with "1 " { $it | parse --regex "1 (?P\\S+) (?:\\S+\\s?){6} (?P\\S+)" } else if $it starts-with "2 " { $it | parse --regex "2 (?P\\S+) (?:\\S+\\s?){6} (?P\\S+)" } else if $it starts-with "u " { $it | parse --regex "u (?P\\S+) (?:\\S+\\s?){8} (?P\\S+)" } else if $it starts-with "? " { $it | parse --regex "(?P.{1}) (?P.+)" } else { { short_status: 'unknown', value: $it } } } | flatten | where $it.short_status in $relevant_statuses | insert "description" { |e| $short_status_descriptions | get $e.short_status} } def "nu-complete git built-in-refs" [] { [HEAD FETCH_HEAD ORIG_HEAD] } def "nu-complete git refs" [] { nu-complete git switchable branches | parse "{value}" | insert description Branch | append (nu-complete git tags | parse "{value}" | insert description Tag) | append (nu-complete git built-in-refs) } def "nu-complete git files-or-refs" [] { nu-complete git switchable branches | parse "{value}" | insert description Branch | append (nu-complete git files | where description == "Modified" | select value) | append (nu-complete git tags | parse "{value}" | insert description Tag) | append (nu-complete git built-in-refs) } def "nu-complete git subcommands" [] { ^git help -a | lines | where $it starts-with " " | parse -r '\s*(?P[^ ]+) \s*(?P\w.*)' } def "nu-complete git add" [] { nu-complete git files } # Check out git branches and files export extern "git checkout" [ ...targets: string@"nu-complete git checkout" # name of the branch or files to checkout --conflict: string # conflict style (merge or diff3) --detach(-d) # detach HEAD at named commit --force(-f) # force checkout (throw away local modifications) --guess # second guess 'git checkout ' (default) --ignore-other-worktrees # do not check if another worktree is holding the given ref --ignore-skip-worktree-bits # do not limit pathspecs to sparse entries only --merge(-m) # perform a 3-way merge with the new branch --orphan: string # new unparented branch --ours(-2) # checkout our version for unmerged files --overlay # use overlay mode (default) --overwrite-ignore # update ignored files (default) --patch(-p) # select hunks interactively --pathspec-from-file: string # read pathspec from file --progress # force progress reporting --quiet(-q) # suppress progress reporting --recurse-submodules # control recursive updating of submodules --theirs(-3) # checkout their version for unmerged files --track(-t) # set upstream info for new branch -b # create and checkout a new branch -B: string # create/reset and checkout a branch -l # create reflog for new branch ] # Download objects and refs from another repository export extern "git fetch" [ repository?: string@"nu-complete git remotes" # name of the branch to fetch --all # Fetch all remotes --append(-a) # Append ref names and object names to .git/FETCH_HEAD --atomic # Use an atomic transaction to update local refs. --depth: int # Limit fetching to n commits from the tip --deepen: int # Limit fetching to n commits from the current shallow boundary --shallow-since: string # Deepen or shorten the history by date --shallow-exclude: string # Deepen or shorten the history by branch/tag --unshallow # Fetch all available history --update-shallow # Update .git/shallow to accept new refs --negotiation-tip: string # Specify which commit/glob to report while fetching --negotiate-only # Do not fetch, only print common ancestors --dry-run # Show what would be done --write-fetch-head # Write fetched refs in FETCH_HEAD (default) --no-write-fetch-head # Do not write FETCH_HEAD --force(-f) # Always update the local branch --keep(-k) # Keep dowloaded pack --multiple # Allow several arguments to be specified --auto-maintenance # Run 'git maintenance run --auto' at the end (default) --no-auto-maintenance # Don't run 'git maintenance' at the end --auto-gc # Run 'git maintenance run --auto' at the end (default) --no-auto-gc # Don't run 'git maintenance' at the end --write-commit-graph # Write a commit-graph after fetching --no-write-commit-graph # Don't write a commit-graph after fetching --prefetch # Place all refs into the refs/prefetch/ namespace --prune(-p) # Remove obsolete remote-tracking references --prune-tags(-P) # Remove any local tags that do not exist on the remote --no-tags(-n) # Disable automatic tag following --refmap: string # Use this refspec to map the refs to remote-tracking branches --tags(-t) # Fetch all tags --recurse-submodules: string # Fetch new commits of populated submodules (yes/on-demand/no) --jobs(-j): int # Number of parallel children --no-recurse-submodules # Disable recursive fetching of submodules --set-upstream # Add upstream (tracking) reference --submodule-prefix: string # Prepend to paths printed in informative messages --upload-pack: string # Non-default path for remote command --quiet(-q) # Silence internally used git commands --verbose(-v) # Be verbose --progress # Report progress on stderr --server-option(-o): string # Pass options for the server to handle --show-forced-updates # Check if a branch is force-updated --no-show-forced-updates # Don't check if a branch is force-updated -4 # Use IPv4 addresses, ignore IPv6 addresses -6 # Use IPv6 addresses, ignore IPv4 addresses ] # Push changes export extern "git push" [ remote?: string@"nu-complete git remotes", # the name of the remote ...refs: string@"nu-complete git local branches" # the branch / refspec --all # push all refs --atomic # request atomic transaction on remote side --delete(-d) # delete refs --dry-run(-n) # dry run --exec: string # receive pack program --follow-tags # push missing but relevant tags --force-with-lease # require old value of ref to be at this value --force(-f) # force updates --ipv4(-4) # use IPv4 addresses only --ipv6(-6) # use IPv6 addresses only --mirror # mirror all refs --no-verify # bypass pre-push hook --porcelain # machine-readable output --progress # force progress reporting --prune # prune locally removed refs --push-option(-o): string # option to transmit --quiet(-q) # be more quiet --receive-pack: string # receive pack program --recurse-submodules: string # control recursive pushing of submodules --repo: string # repository --set-upstream(-u) # set upstream for git pull/status --signed: string # GPG sign the push --tags # push tags (can't be used with --all or --mirror) --thin # use thin pack --verbose(-v) # be more verbose ] # Pull changes export extern "git pull" [ remote?: string@"nu-complete git remotes", # the name of the remote ...refs: string@"nu-complete git local branches" # the branch / refspec --rebase # rebase current branch on top of upstream after fetching ] # Switch between branches and commits export extern "git switch" [ switch?: string@"nu-complete git switch" # name of branch to switch to --create(-c) # create a new branch --detach(-d): string@"nu-complete git log" # switch to a commit in a detatched state --force-create(-C): string # forces creation of new branch, if it exists then the existing branch will be reset to starting point --force(-f) # alias for --discard-changes --guess # if there is no local branch which matches then name but there is a remote one then this is checked out --ignore-other-worktrees # switch even if the ref is held by another worktree --merge(-m) # attempts to merge changes when switching branches if there are local changes --no-guess # do not attempt to match remote branch names --no-progress # do not report progress --no-recurse-submodules # do not update the contents of sub-modules --no-track # do not set "upstream" configuration --orphan: string # create a new orphaned branch --progress # report progress status --quiet(-q) # suppress feedback messages --recurse-submodules # update the contents of sub-modules --track(-t) # set "upstream" configuration ] # Apply the change introduced by an existing commit export extern "git cherry-pick" [ commit?: string@"nu-complete git commits all" # The commit ID to be cherry-picked --edit(-e) # Edit the commit message prior to committing --no-commit(-n) # Apply changes without making any commit --signoff(-s) # Add Signed-off-by line to the commit message --ff # Fast-forward if possible --continue # Continue the operation in progress --abort # Cancel the operation --skip # Skip the current commit and continue with the rest of the sequence ] # Rebase the current branch export extern "git rebase" [ branch?: string@"nu-complete git rebase" # name of the branch to rebase onto upstream?: string@"nu-complete git rebase" # upstream branch to compare against --continue # restart rebasing process after editing/resolving a conflict --abort # abort rebase and reset HEAD to original branch --quit # abort rebase but do not reset HEAD --interactive(-i) # rebase interactively with list of commits in editor --onto?: string@"nu-complete git rebase" # starting point at which to create the new commits --root # start rebase from root commit ] # List or change branches export extern "git branch" [ branch?: string@"nu-complete git local branches" # name of branch to operate on --abbrev # use short commit hash prefixes --edit-description # open editor to edit branch description --merged # list reachable branches --no-merged # list unreachable branches --set-upstream-to: string@"nu-complete git available upstream" # set upstream for branch --unset-upstream # remote upstream for branch --all # list both remote and local branches --copy # copy branch together with config and reflog --format # specify format for listing branches --move # rename branch --points-at # list branches that point at an object --show-current # print the name of the current branch --verbose # show commit and upstream for each branch --color # use color in output --quiet # suppress messages except errors --delete(-d) # delete branch --list # list branches --contains: string@"nu-complete git commits all" # show only branches that contain the specified commit --no-contains # show only branches that don't contain specified commit --track(-t) # when creating a branch, set upstream ] # List or change tracked repositories export extern "git remote" [ --verbose(-v) # Show URL for remotes ] # Add a new tracked repository export extern "git remote add" [ ] # Rename a tracked repository export extern "git remote rename" [ remote: string@"nu-complete git remotes" # remote to rename new_name: string # new name for remote ] # Remove a tracked repository export extern "git remote remove" [ remote: string@"nu-complete git remotes" # remote to remove ] # Get the URL for a tracked repository export extern "git remote get-url" [ remote: string@"nu-complete git remotes" # remote to get URL for ] # Set the URL for a tracked repository export extern "git remote set-url" [ remote: string@"nu-complete git remotes" # remote to set URL for url: string # new URL for remote ] # Show changes between commits, working tree etc export extern "git diff" [ rev1_or_file?: string@"nu-complete git files-or-refs" rev2?: string@"nu-complete git refs" --cached # show staged changes --name-only # only show names of changed files --name-status # show changed files and kind of change --no-color # disable color output ] # Commit changes export extern "git commit" [ --all(-a) # automatically stage all modified and deleted files --amend # amend the previous commit rather than adding a new one --message(-m) # specify the commit message rather than opening an editor --no-edit # don't edit the commit message (useful with --amend) ] # List commits export extern "git log" [ # Ideally we'd allow completion of revisions here, but that would make completion of filenames not work. -U # show diffs --follow # show history beyond renames (single file only) --grep: string # show log entries matching supplied regular expression ] # Show or change the reflog export extern "git reflog" [ ] # Stage files export extern "git add" [ ...file: string@"nu-complete git add" # file to add --all(-A) # add all files --dry-run(-n) # don't actually add the file(s), just show if they exist and/or will be ignored --edit(-e) # open the diff vs. the index in an editor and let the user edit it --force(-f) # allow adding otherwise ignored files --interactive(-i) # add modified contents in the working tree interactively to the index --patch(-p) # interactively choose hunks to stage --verbose(-v) # be verbose ] # Delete file from the working tree and the index export extern "git rm" [ -r # recursive --force(-f) # override the up-to-date check --dry-run(-n) # Don't actually remove any file(s) --cached # unstage and remove paths only from the index ] # Show the working tree status export extern "git status" [ --verbose(-v) # be verbose --short(-s) # show status concisely --branch(-b) # show branch information --show-stash # show stash information ] # Stash changes for later export extern "git stash push" [ --patch(-p) # interactively choose hunks to stash ] # Unstash previously stashed changes export extern "git stash pop" [ stash?: string@"nu-complete git stash-list" # stash to pop --index(-i) # try to reinstate not only the working tree's changes, but also the index's ones ] # List stashed changes export extern "git stash list" [ ] # Show a stashed change export extern "git stash show" [ stash: string@"nu-complete git stash-list" -U # show diff ] # Drop a stashed change export extern "git stash drop" [ stash?: string@"nu-complete git stash-list" ] # Create a new git repository export extern "git init" [ --initial-branch(-b) # initial branch name ] # List or manipulate tags export extern "git tag" [ --delete(-d): string@"nu-complete git tags" # delete a tag ] # Prune all unreachable objects export extern "git prune" [ --dry-run(-n) # dry run --expire: string # expire objects older than --progress # show progress --verbose(-v) # report all removed objects ] # Start a binary search to find the commit that introduced a bug export extern "git bisect start" [ bad?: string # a commit that has the bug good?: string # a commit that doesn't have the bug ] # Mark the current (or specified) revision as bad export extern "git bisect bad" [ ] # Mark the current (or specified) revision as good export extern "git bisect good" [ ] # Skip the current (or specified) revision export extern "git bisect skip" [ ] # End bisection export extern "git bisect reset" [ ] # Show help for a git subcommand export extern "git help" [ command: string@"nu-complete git subcommands" # subcommand to show help for ]