[Libreoffice-commits] core.git: g

Thorsten Behrens Thorsten.Behrens at CIB.de
Mon Jul 2 21:51:00 UTC 2018


 g |  284 +++++++++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 142 insertions(+), 142 deletions(-)

New commits:
commit 4c475bc6763e29f7af2caadc7add42d26e1d6f75
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Jul 2 18:11:22 2018 +0200

    ./g: indent & de-tabbify to make code readable
    
    Change-Id: Ica2a0dd281f77bfab223fa1526ba0720c9c280f1
    Reviewed-on: https://gerrit.libreoffice.org/56821
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/g b/g
index 13bc73939e49..12d7631ff39b 100755
--- a/g
+++ b/g
@@ -31,52 +31,52 @@ usage()
 
 refresh_submodule_hooks()
 {
-local repo=$1
-local hook
-local hook_name
+    local repo=$1
+    local hook
+    local hook_name
 
     if [ -d "${repo?}"/.git ] ; then
         # use core's hook by default
-	for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+        for hook_name in "${COREDIR?}/.git-hooks"/* ; do
             hook="${repo?}/.git/hooks/${hook_name##*/}"
             if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-		rm -f "${hook?}"
-		ln -sf "${hook_name}" "${hook?}"
+                rm -f "${hook?}"
+                ln -sf "${hook_name}" "${hook?}"
             fi
-	done
+        done
         # override if need be by the submodules' own hooks
-	for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+        for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
             hook="${repo?}/.git/hooks/${hook_name##*/}"
             if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-		rm -f "${hook?}"
-		ln -sf "${hook_name}" "${hook?}"
-	    fi
-	done
+                rm -f "${hook?}"
+                ln -sf "${hook_name}" "${hook?}"
+            fi
+        done
     elif [ -d .git/modules/"${repo}"/hooks ] ; then
-	for hook_name in "${COREDIR?}/.git-hooks"/* ; do
+        for hook_name in "${COREDIR?}/.git-hooks"/* ; do
             hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
             if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-		rm -f "${hook?}"
-		ln -sf "${hook_name}" "${hook?}"
+                rm -f "${hook?}"
+                ln -sf "${hook_name}" "${hook?}"
             fi
-	done
+        done
         # override if need be by the submodules' own hooks
-	for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
+        for hook_name in "${COREDIR?}/${repo?}/.git-hooks"/* ; do
             hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
             if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
-		rm -f "${hook?}"
-		ln -sf "${hook_name}" "${hook?}"
-	    fi
-	done
+                rm -f "${hook?}"
+                ln -sf "${hook_name}" "${hook?}"
+            fi
+        done
     fi
 
 }
 
 refresh_all_hooks()
 {
-local repo
-local hook_name
-local hook
+    local repo
+    local hook_name
+    local hook
 
     pushd "${COREDIR?}" > /dev/null
     for hook_name in "${COREDIR?}/.git-hooks"/* ; do
@@ -96,20 +96,20 @@ local hook
 
 set_push_url()
 {
-local repo
+    local repo
 
     repo="$1"
     if [ -n "$repo" ] ; then
-	pushd "${COREDIR?}/${repo?}" > /dev/null
+        pushd "${COREDIR?}/${repo?}" > /dev/null
     else
-	pushd "${COREDIR?}" > /dev/null
-	repo="core"
+        pushd "${COREDIR?}" > /dev/null
+        repo="core"
     fi
     echo "setting up push url for ${repo?}"
     if [ "${repo?}" = "helpcontent2" ] ; then
-	git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
+        git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/help"
     else
-	git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
+        git config remote.origin.pushurl "ssh://${PUSH_USER}logerrit/${repo?}"
     fi
     popd > /dev/null
 }
@@ -119,19 +119,19 @@ set_push_urls()
     PUSH_USER="$1"
     set_push_url
     for repo in ${SUBMODULES_ACTIVE?} ; do
-	set_push_url "${repo?}"
+        set_push_url "${repo?}"
     done
 }
 
 get_active_submodules()
 {
-SUBMODULES_ACTIVE=""
-local repo
+    SUBMODULES_ACTIVE=""
+    local repo
 
     for repo in ${SUBMODULES_ALL?} ; do
-	if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then
-	    SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
-	fi
+        if [ -d "${repo?}"/.git ] || [ -f "${repo?}"/.git ] ; then
+            SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
+        fi
     done
 }
 
@@ -139,10 +139,10 @@ get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
     if [ -f config_host.mk ] ; then
-	SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
+        SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
-	# if we need the configured submodule before the configuration is done. we assumed you want them all
-	SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
+        # if we need the configured submodule before the configuration is done. we assumed you want them all
+        SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
     fi
 }
 
@@ -150,37 +150,37 @@ get_git_reference()
 {
     REFERENCED_GIT=""
     if [ -f config_host.mk ]; then
-	REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
+        REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
     fi
     LINKED_GIT=""
     if [ -f config_host.mk ]; then
-	LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
+        LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
     fi
 }
 
 do_shortcut_update()
 {
-local module
-local repo
+    local module
+    local repo
 
     for module in $SUBMODULES_CONFIGURED ; do
-	if [ ! -d "${module?}"/.git ] ; then
-	    case "${module?}" in
-		helpcontent2)
-		    if [ -d clone/help/.git ] ; then
-			repo="clone/help/.git"
-		    fi
-		    ;;
-		*)
-		    if [ -d clone/"${module?}"/.git ] ; then
-			repo="clone/${module?}/.git"
-		    fi
-		    ;;
-	    esac
-	    if [ -n "$repo" ] ; then
-		cp -r "${repo?}" "${module?}/."
-	    fi
-	fi
+        if [ ! -d "${module?}"/.git ] ; then
+            case "${module?}" in
+                helpcontent2)
+                    if [ -d clone/help/.git ] ; then
+                        repo="clone/help/.git"
+                    fi
+                    ;;
+                *)
+                    if [ -d clone/"${module?}"/.git ] ; then
+                        repo="clone/${module?}/.git"
+                    fi
+                    ;;
+            esac
+            if [ -n "$repo" ] ; then
+                cp -r "${repo?}" "${module?}/."
+            fi
+        fi
     done
 }
 
@@ -193,36 +193,36 @@ do_git_cmd()
 
 do_checkout()
 {
-local cmd
-local create_branch="0"
-local branch
-local module
+    local cmd
+    local create_branch="0"
+    local branch
+    local module
 
     git checkout "$@" || return $?
     for cmd in "$@" ; do
-	if [ "$cmd" = "-f" ]; then
-	    return 0
-	elif [ "$cmd" = "-b" ] ; then
-	    create_branch=1
-	elif [ "$create_branch" = "1" ] ; then
-	    branch="$cmd"
-	    create_branch=0
-	fi
+        if [ "$cmd" = "-f" ]; then
+            return 0
+        elif [ "$cmd" = "-b" ] ; then
+            create_branch=1
+        elif [ "$create_branch" = "1" ] ; then
+            branch="$cmd"
+            create_branch=0
+        fi
     done
     if [ -f .gitmodules ] ; then
-	git submodule update
-	if [ -n "$branch" ] ; then
-	    git submodule foreach git checkout -b "${branch}" HEAD || return $?
-	fi
+        git submodule update
+        if [ -n "$branch" ] ; then
+            git submodule foreach git checkout -b "${branch}" HEAD || return $?
+        fi
     else
-	# now that is the nasty case we moved prior to submodules
-	# delete the submodules left over if any
-	for module in $SUBMODULES_ALL ; do
-	    echo "clean-up submodule $module"
-	    rm -fr "${module}"
-	done
-	# make sure we have the needed repo in clone
-	./g clone && ./g -f checkout "$@" || return $?
+        # now that is the nasty case we moved prior to submodules
+        # delete the submodules left over if any
+        for module in $SUBMODULES_ALL ; do
+            echo "clean-up submodule $module"
+            rm -fr "${module}"
+        done
+        # make sure we have the needed repo in clone
+        ./g clone && ./g -f checkout "$@" || return $?
     fi
     return $?
 }
@@ -231,37 +231,37 @@ do_reset()
 {
     git reset "$@" || return $?
     if [ -f .gitmodules ] ; then
-	git submodule update || return $?
+        git submodule update || return $?
     else
-	# now that is the nasty case we moved prior to submodules
-	# delete the submodules left over if any
-	for module in $SUBMODULES_ALL ; do
-	    echo "clean-up submodule $module"
-	    rm -fr "${module}"
-	done
-	# make sure we have the needed repo in clone
-	./g clone && ./g -f reset "$@"
+        # now that is the nasty case we moved prior to submodules
+        # delete the submodules left over if any
+        for module in $SUBMODULES_ALL ; do
+            echo "clean-up submodule $module"
+            rm -fr "${module}"
+        done
+        # make sure we have the needed repo in clone
+        ./g clone && ./g -f reset "$@"
     fi
     return $?;
 }
 
 do_init_modules()
 {
-local module
-local configured
+    local module
+    local configured
 
     do_shortcut_update
 
     for module in $SUBMODULES_CONFIGURED ; do
-	if [ -n "$LINKED_GIT" ] ; then
-	    if ! [ -d ".git/modules/${module}" ]; then
-		./bin/git-new-module-workdir "${LINKED_GIT}/${module}" "${module}"
-	    fi
-	fi
-	configured=$(git config --local --get submodule."${module}".url)
-	if [ -z "$configured" ] ; then
-	    git submodule init "$module" || return $?
-	fi
+        if [ -n "$LINKED_GIT" ] ; then
+            if ! [ -d ".git/modules/${module}" ]; then
+                ./bin/git-new-module-workdir "${LINKED_GIT}/${module}" "${module}"
+            fi
+        fi
+        configured=$(git config --local --get submodule."${module}".url)
+        if [ -z "$configured" ] ; then
+            git submodule init "$module" || return $?
+        fi
     done
     for module in $SUBMODULES_CONFIGURED ; do
         if [ -n "$REFERENCED_GIT" ] ; then
@@ -314,21 +314,21 @@ while [ "${COMMAND:0:1}" = "-" ] ; do
         -f )KEEP_GOING="||:"
             ;;
         -z)
-	    refresh_all_hooks
-	    exit 0;
+            refresh_all_hooks
+            exit 0;
+            ;;
+        --set-push-urls)
+            shift
+            PUSH_USER="$1"
+            if [ -n "${PUSH_USER}" ] ; then
+                PUSH_USER="${PUSH_USER}@"
+            fi
+            set_push_urls "$PUSH_USER"
+            exit 0;
             ;;
-	--set-push-urls)
-	    shift
-	    PUSH_USER="$1"
-	    if [ -n "${PUSH_USER}" ] ; then
-		PUSH_USER="${PUSH_USER}@"
-	    fi
-	    set_push_urls "$PUSH_USER"
-	    exit 0;
-	    ;;
-	-*)
-	    echo "option: $COMMAND not supported" 1>&2
-	    exit 1
+        -*)
+            echo "option: $COMMAND not supported" 1>&2
+            exit 1
     esac
     shift
     COMMAND="$1"
@@ -338,42 +338,42 @@ shift
 
 case "$COMMAND" in
     branch)
-	do_git_cmd "${COMMAND}" "$@"
-	;;
+        do_git_cmd "${COMMAND}" "$@"
+        ;;
     checkout)
-	do_checkout "$@"
-	;;
+        do_checkout "$@"
+        ;;
     clone)
-	do_init_modules && refresh_all_hooks
+        do_init_modules && refresh_all_hooks
         ;;
     fetch)
-	(git fetch "$@" && git submodule foreach git fetch "$@" ) && git submodule update
+        (git fetch "$@" && git submodule foreach git fetch "$@" ) && git submodule update
 
-	;;
+        ;;
     grep)
         KEEP_GOING="||:"
-	do_git_cmd "${COMMAND}" "$@"
-	;;
+        do_git_cmd "${COMMAND}" "$@"
+        ;;
     pull)
-	git pull "$@" && git submodule update && refresh_all_hooks
-	;;
+        git pull "$@" && git submodule update && refresh_all_hooks
+        ;;
     push)
-	git submodule foreach git push "$@"
-	if [ "$?" = "0" ] ; then
-	    git push "$@"
-	fi
-	;;
+        git submodule foreach git push "$@"
+        if [ "$?" = "0" ] ; then
+            git push "$@"
+        fi
+        ;;
     reset)
-	do_reset
-	;;
+        do_reset
+        ;;
     tag)
-	do_git_cmd "${COMMAND}" "$@"
-	;;
-	"")
-	;;
+        do_git_cmd "${COMMAND}" "$@"
+        ;;
+    "")
+        ;;
     *)
-	echo "./g does not support command: $COMMAND" 1>&2
-	exit 1;
+        echo "./g does not support command: $COMMAND" 1>&2
+        exit 1;
         ;;
 esac
 


More information about the Libreoffice-commits mailing list