limbo.sh

#!/usr/bin/env bash

# ------------
# Spinner
# ------------
sp='/-\|'
sc=0
spin() {
    echo -en "\r$1 ${sp:sc++:1}"
    ((sc==${#sp})) && sc=0
}
endspin() {
    printf '\r%s\n' "$@"
}

waitingForChange=0
conflictsToSolve=0

# ------------
# Wait
# ------------
wait() {
	stopConflictBlock;
    spin "Waiting for change"
    waitingForChange=1
}

stopWait() {
    if [ $waitingForChange -eq 1 ]; then
	    waitingForChange=0
	    endspin
    fi
}

# ------------
# PULL
# ------------
pull() {
	stopConflictBlock;
	stopWait;
    echo -e "\n-----------------------------";
    echo "Pull";
    git pull --rebase;
    echo -e "-----------------------------\n";
    echo -e "\n"
}

# ------------
# PUSH
# ------------
initialPush() {
    echo -e "\n-----------------------------";
    echo "Initial Push";

	BRANCH_NAME=`git rev-parse --abbrev-ref HEAD`
	git push -u origin $BRANCH_NAME;

    echo -e "-----------------------------\n";
}
push() {
	stopConflictBlock;
	stopWait;
    echo -e "\n-----------------------------";
    echo "Push";
    git push;
    echo -e "-----------------------------\n";
}

# ------------
# Conflicts
# ------------
handleConflicts() {
	stopWait;
    if [[ $conflictsToSolve -eq 0 ]]; then
        echo -e "\033[0;31mBEWARE ! No action possible, fix the divergence (possible rebase conflicts).\033[0m"
        read -p "Would like to reset your local copy to match the remote one ? (y/N) " reset
        if [ "$reset" == "y" ]; then
            git reset --hard origin/$(git rev-parse --abbrev-ref HEAD)
        fi
        conflictsToSolve=1
    fi
}

stopConflictBlock() {
    if [ $conflictsToSolve -eq 1 ]; then
        conflictsToSolve=0
    fi
}

# ------------
# LOOP
# ------------
while(true);
  do
     git remote update &> /dev/null;
     UPSTREAM=${1:-'@{u}'}
     LOCAL=$(git rev-parse @)
     REMOTE=$(git rev-parse "$UPSTREAM")
     BASE=$(git merge-base @ "$UPSTREAM")

     if [ $LOCAL = $REMOTE ]; then
         wait;
     elif [ $LOCAL = $BASE ]; then
         pull;
     elif [ $REMOTE = $BASE ]; then
         push;
     else
         handleConflicts;
     fi
  done;