git-bubbles.sh

#!/usr/bin/env bash

set -e

#==============================================================================
# The MIT License
#
# Copyright (c) 2013-, Frédéric Menou
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
#==============================================================================

function log {
  git --no-pager log --oneline --decorate --graph "$@"
}

function find_pushable_head {
  local pattern=$1
  git log --oneline "HEAD@{u}.." | sed "/${pattern}/d" | head -1 | cut -d" " -f1
}

filter_pattern=$(git config bubbles.pattern || echo "--")
mine=$(git config bubbles.remote-name || echo "origin")

commit=$(find_pushable_head "$filter_pattern")
branch_name=$(git rev-parse --symbolic-full-name HEAD | sed 's-^refs/heads/--')

push_command="git push $mine $commit:$branch_name --force"

function print_log {
  if [[ ! $(git rev-parse HEAD) =~ ^$commit ]]; then
    log "${commit}..HEAD"
    echo "--------------------------------------------------"
  fi
  log "HEAD@{u}..$commit"
}

function announce {
  echo "$*"
  "$@"
}

function print_status {
  local command=$1
  missing_branch=$(git rev-parse "$mine/$branch_name" >/dev/null 2>/dev/null || echo "1")

  if [ "$missing_branch" == "1" ]; then
    echo "Branch $branch_name not yet pushed on ${mine}. To create it:"
    echo "git push $mine HEAD"
  else
    diff_stat=$(git diff --stat "$mine/$branch_name..$commit" 2>/dev/null | wc -c)
    log_stat=$(git --no-pager log --oneline "$mine/$branch_name..$commit" 2>/dev/null | wc -l)
    if [ "$diff_stat" != "0" ]; then
      if [ "$command" == "execute" ]; then
        $push_command
      else
        announce git diff -b -M "$mine/$branch_name..$commit" --stat

        echo ""
        echo "$push_command"
      fi
    elif [ "$log_stat" != "0" ]; then
      echo "No diff but history diverged."
      echo ""
      if [ "$command" == "execute" ]; then
        $push_command
      else
        echo "$push_command"
      fi
    else
      echo "Nothing to push. We're good!"
    fi
  fi
}

if [ "$1" == "push" ]; then
  print_status execute

elif [ "$1" == "diff" ]; then
  shift 1
  if [ "$diff_stat" != "0" ]; then
    announce git diff -b -M "$mine/$branch_name..$commit" "$@"
  fi

elif [ "$1" == "content" ]; then
  shift 1
  git diff --stat --patch -w -M "HEAD@{u}..$commit" "$@"

else
  print_log
  echo ""
  print_status
fi