Skip to content

[WIP]: Add basic make pr command #34

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.

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Changes from all commits
Commits
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
70 changes: 70 additions & 0 deletions git-make-pr
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
#!/usr/bin/env bash

# Copyright 2023 Calum Murray
#
# 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.

case "$(uname -sr)" in
Darwin*)
USE_OPEN=true
;;
Linux*)
USE_XDG_OPEN=true
;;
*)
;;
esac

if git remote | grep -q upstream
then
REMOTE=$(git remote get-url upstream)
else
REMOTE=$(git remote get-url origin)
fi

if $DEBUG
then
echo $REMOTE
fi

BASE_URL=$(echo $REMOTE | sed -r 's:git@([^/]+)\:(.*)\.git:https\://\1/\2:g')

if $DEBUG
then
echo $BASE_URL
fi

TRACKING_BRANCH=$(git for-each-ref --format='%(upstream:short)' "$(git symbolic-ref -q HEAD)" | sed -r 's:(.+)/(.*):\2:g')
if [[ -z $TRACKING_BRANCH ]]
then
git push -u origin $(git branch --show-current)
TRACKING_BRANCH="origin/$(git branch --show-current)"
else
# still want to push any existing commits on our branch
git push
fi
if $DEBUG
then
echo $TRACKING_BRANCH
fi

PULL_URL="$BASE_URL/compare/main...$TRACKING_BRANCH?quick_pull=1"
if $USE_OPEN
then
open $PULL_URL
elif $USE_XDG_OPEN
then
xdg-open $PULL_URL
else
echo $PULL_URL
fi