Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add key binding for selecting Git pull requests via fzf #251

Merged
merged 2 commits into from
Feb 18, 2024
Merged

Add key binding for selecting Git pull requests via fzf #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4da44
Add key binding for selecting Git pull requests via fzf
kelleyma49 Feb 18, 2024
c91b890
Refactor git remote URL handling and add support for Azure DevOps
kelleyma49 Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 84 additions & 3 deletions PSFzf.Git.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ function SetupGitPaths() {
}
return $script:foundGit
}

function SetGitKeyBindings($enable) {
if ($enable) {
if (-not $(SetupGitPaths)) {
Expand All @@ -68,11 +69,12 @@ function SetGitKeyBindings($enable) {
}

if (Get-Command Set-PSReadLineKeyHandler -ErrorAction Ignore) {
@('ctrl+g,ctrl+b', 'Select Git branches via fzf', { Update-CmdLine $(Invoke-PsFzfGitBranches) }), `
@('ctrl+g,ctrl+f', 'Select Git files via fzf', { Update-CmdLine $(Invoke-PsFzfGitFiles) }), `
@('ctrl+g,ctrl+h', 'Select Git hashes via fzf', { Update-CmdLine $(Invoke-PsFzfGitHashes) }), `
@('ctrl+g,ctrl+b', 'Select Git branches via fzf', { Update-CmdLine $(Invoke-PsFzfGitBranches) }), `
@('ctrl+g,ctrl+t', 'Select Git tags via fzf', { Update-CmdLine $(Invoke-PsFzfGitTags) }), `
@('ctrl+g,ctrl+s', 'Select Git stashes via fzf', { Update-CmdLine $(Invoke-PsFzfGitStashes) }) `
@('ctrl+g,ctrl+p', 'Select Git pull requests via fzf', { Update-CmdLine $(Invoke-PsFzfGitPulLRequests) }), `
@('ctrl+g,ctrl+s', 'Select Git stashes via fzf', { Update-CmdLine $(Invoke-PsFzfGitStashes) }), `
@('ctrl+g,ctrl+t', 'Select Git tags via fzf', { Update-CmdLine $(Invoke-PsFzfGitTags) }) `
| ForEach-Object {
$script:GitKeyHandlers += $_[0]
Set-PSReadLineKeyHandler -Chord $_[0] -Description $_[1] -ScriptBlock $_[2]
Expand Down Expand Up @@ -256,3 +258,82 @@ function Invoke-PsFzfGitStashes() {

$result
}

function Invoke-PsFzfGitPullRequests() {
if (-not (IsInGitRepo)) {
return
}

if (-not $(SetupGitPaths)) {
Write-Error "git executable could not be found"
return
}
# find the repo remote URL
$remoteUrl = git config --get remote.origin.url

# GitHub
if ($remoteUrl -match 'github.com') {
$script:ghCmdInfo = Get-Command gh -ErrorAction Ignore
if ($null -ne $script:ghCmdInfo) {
$listAllPrsCmdJson = Invoke-Expression "gh pr list --json id,author,title,number"
$objs = $listAllPrsCmdJson | ConvertFrom-Json | ForEach-Object {
[PSCustomObject]@{
PR = "$($PSStyle.Foreground.Green)" + $_.number
Title = "$($PSStyle.Foreground.Magenta)" + $_.title
Creator = "$($PSStyle.Foreground.Yellow)" + $_.author.login
}
}
}
else {
Write-Error "Repo is a GitHub repo and gh command not found"
return
}
$webCmd = 'gh pr view {1} --web'
$previewCmd = 'gh pr view {1} && gh pr diff {1}'
}
# Azure DevOps
elseif ($remoteUrl -match 'dev.azure.com') {
$script:azCmdInfo = Get-Command az -ErrorAction Ignore
if ($null -ne $script:azCmdInfo) {
$listAllPrsCmdJson = Invoke-Expression 'az repos pr list --status "active" --query "[].{title: title, number: pullRequestId, creator: createdBy.uniqueName}"'
$objs = $listAllPrsCmdJson | ConvertFrom-Json | ForEach-Object {
[PSCustomObject]@{
PR = "$($PSStyle.Foreground.Green)" + $_.number
Title = "$($PSStyle.Foreground.Magenta)" + $_.title
Creator = "$($PSStyle.Foreground.Yellow)" + $_.creator
}
}
}
else {
Write-Error "Repo is an Azure DevOps repo and az command not found"
return
}
$webCmd = 'az repos pr show --id {1} --open --output none'
$previewCmd = 'az repos pr show --id {1} --query "{Created:creationDate, Closed:closedDate, Creator:createdBy.displayName, PR:codeReviewId, Title:title, Repo:repository.name, Reviewers:join('', '',reviewers[].displayName), Source:sourceRefName, Target:targetRefName}" --output yamlc'
}

$fzfArguments = Get-GitFzfArguments
$fzfArguments['Bind'] += 'ctrl-o:execute-silent(' + $webCmd + ')'
$header = "CTRL-O (open in browser)`n`n"

$prevCLICOLOR_FORCE = $env:CLICOLOR_FORCE
$prevOutputRendering = $PSStyle.OutputRendering

$env:CLICOLOR_FORCE = 1 # make gh show keep colors
$PSStyle.OutputRendering = 'Ansi'

try {
$result = @()
$objs | out-string -Stream | Where-Object { -not [string]::IsNullOrWhiteSpace($_) } | `
Invoke-Fzf @fzfArguments -Header $header -Preview "$previewCmd" -HeaderLines 2 -BorderLabel '🆕 Pull Requests' | `
ForEach-Object {
$result += $_.Split(' ')[0]
}
}
finally {
$env:CLICOLOR_FORCE = $prevCLICOLOR_FORCE
$PSStyle.OutputRendering = $prevOutputRendering
}

$result
}