gitvb-unpick

#!/usr/bin/env bash
set -e

GITVB_HOME="./.git/.gitvb-v0"
MAIN_BRANCH="${MAIN_BRANCH:-main}"

if [ "$1" == "" ]; then
    echo "usage: gitvb-unpick <branch>"
    exit 1
fi
pickBranch="$1"


if [ ! -z "$(git diff --staged)" ]; then
    echo "there are staged changes. exiting."
    exit 1
fi

if [ "$(git branch --show-current)" != "$MAIN_BRANCH" ]; then
    echo "you are not on the main branch: $MAIN_BRANCH"
    exit 1
fi

# this is safe to always check because other gitvb programs stash before calling this
gitvb-is-unpickable "$pickBranch"

vbFilePath="$GITVB_HOME/$pickBranch.gitvb"

if [ ! -f "$vbFilePath" ]; then
    echo "not picked $pickBranch"
    exit 2
fi

gitvb-wip unpick
# vbFileContents="$(cat "$vbFilePath")"

# Extract foo value (single line)
base=$(awk -F'=' '/^base=/ {print $2}' $vbFilePath)

# Extract bar value (from bar= to the end of the file)
# applied=$(awk '/^applied=/{flag=1; sub(/^applied=/,""); print; next} flag' "$vbFilePath")
applied="$(git log --pretty=format:"%H %s" | fgrep "[gitvb:$pickBranch]" | awk '{print $1}')"

# git config core.abbrev 40 && EDITOR=nano git rebase -i b3eb88d3bc37ce79ed8f1f0cec440d404016da18 && git config --unset core.abbrev
echo "base:"
echo "$base"
echo "applied:"
echo "$applied"


if [ ! -z "$applied" ]; then
    # commands=$(echo "$applied" | sed "s/^/drop /" | sed "s/'/'\\\\''/g" | awk '{printf "'\''%s'\'' ", $0}' | tr '\n' ' ')
    commands=$(echo "$applied"| sed "s/^/drop /" | sed 's/.*/"&"/'  | tr '\n' ' ')

    echo "the commands: $commands"
    echo "firing interactive rebase"

    git config core.abbrev 40
    LASTEDITOR="$EDITOR"
    EDITOR="$(dirname $0)/gitvb-editor-interactive-rebase $commands"
    git rebase -i "$base"
    EDITOR="$LASTEDITOR"

    # todo fire this on fail too
    git config --unset core.abbrev

else
    echo "none applied to undo"
fi

rm -v "$vbFilePath"
gitvb-wip-undo unpick

echo
echo "succesfully unpicked $pickBranch"
echo