if [ "$1" == "-Xed" ]

then

if [ $(basename "$3") == "TAG_EDITMSG" ]

then

sed -e "1s/.*/$2/" -i "" "$3"

fi

# cat "$3"

exit

elif [ "$1" == "-h" -o "$1" == "--help" ]

then

echo "Usage: git lava [<commit message>]"

echo

echo "See https://github.com/WebEngage/git-lava for more details"

exit

elif [ "$1" != "" ]

then

COMMIT_MESSAGE=$1

hotflow

else

COMMIT_MESSAGE=""

hotflow

fi

if ! git status > /dev/null 2>&1

then

echo "Something wrong with git"

exit 1

fi

GIT_ROOT=$(git rev-parse --show-toplevel)

cd "$GIT_ROOT"

if ! which git-flow > /dev/null 2>&1

then

echo "git-flow is not installed. Refer https://github.com/nvie/gitflow/wiki/Installation"

exit 1

fi

HOTFIX_PREFIX=$(git config --get gitflow.prefix.hotfix)

RELEASE_PREFIX=$(git config --get gitflow.prefix.release)

MASTER_BRANCH=$(git config --get gitflow.branch.master)

DEVELOP_BRANCH=$(git config --get gitflow.branch.develop)

if [ "$HOTFIX_PREFIX" == "" -o "$RELEASE_PREFIX" == "" -o "$MASTER_BRANCH" == "" -o "$DEVELOP_BRANCH" == "" ]

then

echo "Run 'git flow init' first"

exit 1

fi

HOTFIX_PREFIX=${HOTFIX_PREFIX/\//}

RELEASE_PREFIX=${RELEASE_PREFIX/\//}

PREFIX=$(git config --get gitlava.tagprefix)

if [ "$PREFIX" == "" ]

then

err "Tag prefix is not set!"

echo "Run"

pretty "git config gitlava.tagprefix <prefix>"

echo

echo "For prefix 'shifu' and hotfix version 3.1.4"

echo " - change commit is tagged as 'shifu-3.1.4'"

echo " - hotfix branch is created as '$HOTFIX_PREFIX/shifu-3.1.4'"

echo

echo "If you don't want a prefix set it as '-'"

exit 1

elif [ "$PREFIX" == "-" ]

then

PREFIX=""

else

PREFIX="$PREFIX-"

fi

CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null)

if [ $CURRENT_BRANCH != "$MASTER_BRANCH" ]

then

echo "Not on master branch '$MASTER_BRANCH'"

exit 1

fi

# add unstaged changes except submodules"

git diff --name-only | while read CHANGE

do

if ! git config --file=.gitmodules "submodule.$CHANGE.url" > /dev/null

then

pretty "git add --all \"$CHANGE\""

git add --all "$CHANGE"

fi

done

# are there any staged changes?

if git diff --cached --no-ext-diff --quiet --exit-code

then

echo "No changes"

exit 1

fi

# status after staging changes

git status --short --untracked-files=no

STASH_NAME="gitlava@$(date +%s)000"

pretty "git stash save \"$STASH_NAME\"" "stashing staged changes and modifications"

git stash save "$STASH_NAME"

# was a stash saved?

if git stash list | head -1 | grep -q "$STASH_NAME"

then

STASH_SAVED=yes

fi

pretty "git pull" "in master branch"

git pull

CURRENT_RELEASE_VERSION=$(git log --merges --grep="Merge branch '$RELEASE_PREFIX/$PREFIX[0-9]*\.[0-9]*\(\.0\)\?'" --format="%s" -n 1 | sed "s/Merge branch '$RELEASE_PREFIX\/$PREFIX\([0-9]*\.[0-9]*\)\(\.0\)\{0,1\}'.*/\1/")

pretty "git checkout $DEVELOP_BRANCH"

git checkout "$DEVELOP_BRANCH"

pretty "git pull" "in develop branch"

git pull

LAST_VERSION=$(git log --merges --grep="Merge branch '$HOTFIX_PREFIX/$PREFIX[0-9]*\.[0-9]*\.[0-9]*' into $DEVELOP_BRANCH" --format="%s" -n 1 | sed "s/Merge branch '$HOTFIX_PREFIX\/$PREFIX\([0-9]*\.[0-9]*\.[0-9]*\)' into $DEVELOP_BRANCH/\1/")

if [ "$CURRENT_RELEASE_VERSION" == "" ]

then

# rollback; can't proceed

pretty "git checkout $MASTER_BRANCH"

git checkout "$MASTER_BRANCH"

if [ "$STASH_SAVED" == "yes" ]

then

pretty "git stash pop" "unstashing"

git stash pop

fi

echo

err "A current release version was not detected!"

echo "git-lava searches the log for commit messages like \"Merge branch '$RELEASE_PREFIX/${PREFIX}x.y'\""

echo

echo "If no release has ever been created in the project, create one before running 'git lava'"

exit 1

fi

MAJOR_VERSION=$(echo $LAST_VERSION | sed "s/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/")

MINOR_VERSION=$(echo $LAST_VERSION | sed "s/[0-9]*\.[0-9]*\.\([0-9]*\)/\1/")

if [ "$LAST_VERSION" != "" ] && greater $MAJOR_VERSION $CURRENT_RELEASE_VERSION

then

echo

err "Latest hotfix ($LAST_VERSION) has a major version greater than current release version ($CURRENT_RELEASE_VERSION)"

err "Rickrolling back"

# rollback

pretty "git checkout $MASTER_BRANCH"

git checkout "$MASTER_BRANCH"

if [ "$STASH_SAVED" == "yes" ]

then

pretty "git stash pop" "unstashing"

git stash pop

fi

exit 1

elif [ "$MAJOR_VERSION" != "$CURRENT_RELEASE_VERSION" ]

then

MAJOR_VERSION="$CURRENT_RELEASE_VERSION"

MINOR_VERSION=0

fi

let NEXT_MINOR_VERSION=$MINOR_VERSION+1

NEXT_VERSION="$MAJOR_VERSION".$NEXT_MINOR_VERSION

while git rev-parse "$PREFIX$NEXT_VERSION" > /dev/null 2>&1

do

let NEXT_MINOR_VERSION=$NEXT_MINOR_VERSION+1

NEXT_VERSION="$MAJOR_VERSION".$NEXT_MINOR_VERSION

done

TAG_NAME="$PREFIX$NEXT_VERSION"

BRANCH_NAME="$HOTFIX_PREFIX/$TAG_NAME"

# setting up a trap to rollback on ctrl+C

trap rollback SIGINT

pretty "git flow hotfix start $TAG_NAME"

git flow hotfix start $TAG_NAME

if [ $? -ne 0 ]

then

rollback

fi

if [ "$STASH_SAVED" == "yes" ]

then

pretty "git stash apply --index"

git stash apply --index

fi

if [ $? -ne 0 ]

then

rollback

fi

pretty "git --no-pager diff --cached" "showing all modifications"

git --no-pager diff --cached

if [ "$COMMIT_MESSAGE" == "" ]

then

pretty "git commit"

git commit

else

pretty "git commit -m \"$COMMIT_MESSAGE\""

git commit -m "$COMMIT_MESSAGE"

fi

# get the location of this script

SCRIPT_DIRECTORY=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)

SCRIPT_NAME=$(basename "${BASH_SOURCE[0]}")

# BIG hack - sets itself as editor for merge commit and tag messages

# so that 'git flow hotfix finish' goes on non-interactively

export GIT_EDITOR="$SCRIPT_DIRECTORY/$SCRIPT_NAME -Xed $TAG_NAME"

pretty "git flow hotfix finish $TAG_NAME"

git flow hotfix finish $TAG_NAME

if [ $? -ne 0 ]

then

rollback

fi

pretty "git push" "push develop branch to origin"

git push

if [ $? -ne 0 ]

then

rollback

fi

pretty "git checkout $MASTER_BRANCH"

git checkout "$MASTER_BRANCH"

pretty "git push --follow-tags" "push master branch along with tags to origin"

git push --follow-tags

if [ $? -ne 0 ]

then

echo

err "Couldn't push to origin/$MASTER_BRANCH... also cannot rollback ☹"

echo "Changes are preserved in 'stash@{0}'"

exit

fi

if [ "$STASH_SAVED" == "yes" ]

then

pretty "git stash drop"

git stash drop

fi

yo "Created hotfix ($TAG_NAME)"

# rollback

trap - SIGINT # reset trap

echo

err "Rolling back ☹"

# in case we are still in the hotfix branch and there were merge commits on stash apply

pretty "git reset --hard" "cleaning up index and working tree changes"

git reset --hard

pretty "git checkout $DEVELOP_BRANCH"

git checkout "$DEVELOP_BRANCH"

pretty "git reset --hard origin/$DEVELOP_BRANCH"

git reset --hard "origin/$DEVELOP_BRANCH"

pretty "git checkout $MASTER_BRANCH"

git checkout "$MASTER_BRANCH"

pretty "git reset --hard origin/$MASTER_BRANCH"

git reset --hard "origin/$MASTER_BRANCH"

pretty "git branch -D $BRANCH_NAME"

git branch -D "$BRANCH_NAME"

pretty "git tag -d $TAG_NAME"

git tag -d "$TAG_NAME"

if [ "$STASH_SAVED" == "yes" ]

then

pretty "git stash pop"

git stash pop

fi

echo

err "Couldn't create hotfix ($TAG_NAME)"

exit 1

VERSION_A=$1

VERSION_B=$2

VERSION_A_MAJOR=$(echo $VERSION_A | sed "s/\([0-9]*\)\.[0-9]*/\1/")

VERSION_A_MINOR=$(echo $VERSION_A | sed "s/[0-9]*\.\([0-9]*\)/\1/")

VERSION_B_MAJOR=$(echo $VERSION_B | sed "s/\([0-9]*\)\.[0-9]*/\1/")

VERSION_B_MINOR=$(echo $VERSION_B | sed "s/[0-9]*\.\([0-9]*\)/\1/")

if [ $VERSION_A_MAJOR -gt $VERSION_B_MAJOR ]

then

return 0

fi

if [ $VERSION_A_MAJOR -eq $VERSION_B_MAJOR -a $VERSION_A_MINOR -gt $VERSION_B_MINOR ]

then

return 0

fi

return 1

if [ "$2" == "" ]

then

printf "\n\e[1m\e[103m\e[31m→ \e[30m$1\e[0m\n"

else

printf "\n\e[1m\e[103m\e[31m→ \e[30m$1 \e[2m\e[21m# $2\e[0m\n"

fi