AdeAttwood/Dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(sapling): display the pr link if we have already created one

Browse source 
When pushing your stack we show all the branches we have pushed to with
a compare link to github. When we create a PR the compare link is no
longer relevant. Now we will show a link to the PR that is associated
with that branch.
This commit is contained in:
Ade Attwood 2024-06-08 18:00:16 +01:00
parent a5cd17fe58
commit a39b844c63
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
site-modules/core/files/bin/sl-push-bookmakrs
View file

@ -2,8 +2,8 @@
default_path="$(sl config paths.default)" default_path="$(sl config paths.default)"
url="${default_path%*.git}" url="${default_path%*.git}"
project="$(basename $(dirname "$url"))/$(basename "$url")"
#
# "top % public()" => non-public commits in my stack # "top % public()" => non-public commits in my stack
# "top" => from the top of my stack # "top" => from the top of my stack
# "% X" => except not in X # "% X" => except not in X
@ -12,9 +12,12 @@ url="${default_path%*.git}"
previous_bookmark_query="" previous_bookmark_query=""
previous_bookmark="" previous_bookmark=""
for i in $(sl log -r "top % public()" -T "{bookmarks} "); do for i in $(sl log -r "top % public()" -T "{bookmarks} "); do
commits="$(sl log -r "::$i % public()$previous_bookmark_query")" commits="$(sl log -T" - {firstline(desc)} ({node|short})\n" -r "::$i % public()$previous_bookmark_query")"
pr_url="$(gh pr view -R "$project" --json "url" --jq '.url' "$i" 2>&1)"
if [[ -z "$previous_bookmark" ]]; then if [[ "$pr_url" != "no pull requests found for branch"* ]]; then
echo "$pr_url"
elif [[ -z "$previous_bookmark" ]]; then
echo "$url/compare/$i" echo "$url/compare/$i"
else else
echo "$url/compare/$previous_bookmark...$i" echo "$url/compare/$previous_bookmark...$i"
@ -22,6 +25,7 @@ for i in $(sl log -r "top % public()" -T "{bookmarks} "); do
echo "$commits" echo "$commits"
sl push -f -r "$i" --to "remote/$i" 2>&1 | grep -E "[\+\*]" sl push -f -r "$i" --to "remote/$i" 2>&1 | grep -E "[\+\*]"
echo ""
previous_bookmark_query=" % ::$i" previous_bookmark_query=" % ::$i"
previous_bookmark="$i" previous_bookmark="$i"