git-hf-update

#!/usr/bin/env bash
#
# HubFlow - a fork of the git-flow tools to apply Vincent Driessen's
# branching model to working with GitHub
#
# Original blog post presenting this model is found at:
#    http://nvie.com/git-model
#
# The HubFlow documentation is found at:
#    http://datasift.github.com/gitflow/
#
# Feel free to contribute to this project at:
#    http://github.com/datasift/gitflow
#
# Copyright 2010 Vincent Driessen. All rights reserved.
# Copyright 2012 MediaSift Ltd. All rights reserved.
#
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
#    1. Redistributions of source code must retain the above copyright notice,
#       this list of conditions and the following disclaimer.
#
#    2. Redistributions in binary form must reproduce the above copyright
#       notice, this list of conditions and the following disclaimer in the
#       documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY VINCENT DRIESSEN ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL VINCENT DRIESSEN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
# OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
# The views and conclusions contained in the software and documentation are
# those of the authors and should not be interpreted as representing official
# policies, either expressed or implied, of Vincent Driessen.
#

require_git_repo
require_hubflow_initialized
hubflow_load_settings

usage() {
	echo "usage: git hf update [-p]"
}

parse_args() {
	# parse options
	FLAGS "$@" || exit $?
	eval set -- "${FLAGS_ARGV}"
}

use_current_feature_branch_name() {
	local current_branch=$(git_current_branch)

	if [[ $current_branch == *"/"* ]]; then
		FEATURE_BRANCH=$current_branch
		NAME=${FEATURE_BRANCH#$FEATURE_PREFIX}
	fi
}

cmd_default() {
	cmd_update "$@"
}

cmd_help() {
	usage
	exit 0
}

cmd_update() {
	# flags
	DEFINE_boolean prune true "delete local copies of branches that have been deleted from $ORIGIN" p
	DEFINE_boolean rebase false "merge instead of rebase" r

	parse_args "$@"

	# make sure we're okay to start
	require_clean_working_tree

	# fetch and merge the latest changes from origin
	hubflow_merge_latest_changes_from_origin

	# make sure we end up where we should be
	if [[ $(git_current_branch) != $CURRENT_BRANCH ]] ; then
		git checkout "$CURRENT_BRANCH" || die "Unable to checkout branch '$CURRENT_BRANCH'"
	fi

	use_current_feature_branch_name

	if [[ -n $FEATURE_BRANCH ]]; then
		BASE_BRANCH=$(git_config_get_branch $FEATURE_BRANCH hubflowBase)
		if [[ -n $BASE_BRANCH ]]; then
		    echo "Feature is $NAME"
            echo "Base is    $BASE_BRANCH"
            if flag rebase; then
            	git rebase $BASE_BRANCH
			else
            	git merge $BASE_BRANCH
			fi
		fi
    fi

	# drop any branches that have disappeared from origin
	if flag prune ; then
		git fetch --prune || die "Unable to prune branches that no longer exist at '$ORIGIN'"
	fi

	# all done
	echo
	echo "Summary of actions:"
	echo "- Any changes to branches at $ORIGIN have been downloaded to your local repository"
	if flag prune ; then
		echo "- Any branches that have been deleted at $ORIGIN have also been deleted from your local repository"
	fi
	echo "- Any changes from $ORIGIN/$MASTER_BRANCH have been merged into branch '$MASTER_BRANCH'"
	echo "- Any changes from $ORIGIN/$DEVELOP_BRANCH have been merged into branch '$DEVELOP_BRANCH'"
	if [[ -n $BASE_BRANCH ]]; then
	    echo "- Any changes from $ORIGIN/$BASE_BRANCH have been merged into $CURRENT_BRANCH"
	fi
	echo "- Any changes in support branches at $ORIGIN have been merged into your local support branches"
	echo "- Any resolved merge conflicts have been pushed back to $ORIGIN"
	echo "- You are now on branch '$CURRENT_BRANCH'"
}