diff options
| -rwxr-xr-x | git-svn-helper | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/git-svn-helper b/git-svn-helper index 01194cd..1e59b2b 100755 --- a/git-svn-helper +++ b/git-svn-helper @@ -79,7 +79,7 @@ function create_local_repo () { done } -function fetch_svn () { +function svn_fetch () { say "** cd ${SRC}${SVN_CLONE_DIR}${RESET}" && cd ${SVN_CLONE_DIR} || error say "** fetch from ${URL_COLOR}${SVN_URL}${RESET}" && git svn fetch || error BRANCHES=$(git for-each-ref --format="%(refname:short)" refs/heads/) @@ -90,7 +90,7 @@ function fetch_svn () { say "** fetch ${SRC}${SVN_CLONE_REPO}${RESET}" && git fetch ${SVN_CLONE_REPO} || error } -function push_to_clone () { +function push_to_svn_clone () { say "** cd ${SRC}${SVN_CLONE_DIR}${RESET}" && cd ${SVN_CLONE_DIR} || error say "** fetch ${LRC}${LOCAL_REPO}${RESET}" && git fetch ${LOCAL_REPO} || error say "** checkout ${SBC}${SVN_B}${RESET}" && git checkout ${SVN_B} || error @@ -100,14 +100,14 @@ function push_to_clone () { say "** fetch ${SRC}${SVN_CLONE_REPO}${RESET}" && git fetch ${SVN_CLONE_REPO} || error } -function dcommit () { +function svn_dcommit () { say "** cd ${SRC}${SVN_CLONE_DIR}${RESET}" && cd ${SVN_CLONE_DIR} || error say "** checkout ${SBC}${SVN_B}${RESET}" && git checkout ${SVN_B} || error say "** rebase ${SRC}${SVN_CLONE_REPO}${RESET}/${SBC}${SVN_B}${RESET}" && git svn rebase || error say "** dcommit ${SRC}${SVN_CLONE_REPO}${RESET}/${SBC}${SVN_B}${RESET} to ${URL_COLOR}${SVN_URL}${RESET}" && git svn dcommit } -function pull_from_clone () { +function pull_from_svn_clone () { #say "** cd ${SRC}${LOCAL_DIR}${RESET}" && cd ${LOCAL_DIR} || error #say "** fetch ${SRC}${SVN_CLONE_REPO}${RESET}" && git fetch ${SVN_CLONE_REPO} || error #say "** merge ${SRC}${SVN_CLONE_REPO}${RESET}/${SBC}${SVN_B}${RESET} within ${LRC}${LOCAL_REPO}${RESET}/${LBC}${LOCAL_B}${RESET}" && git merge ${SVN_CLONE_REPO}/${SVN_B} || error @@ -152,16 +152,16 @@ while [ -z "$ACTIONS" ]; do exit 0 ;; 1) - fetch_svn + svn_fetch ;; 2) - push_to_clone + push_to_svn_clone ;; 3) - dcommit + svn_dcommit ;; 4) - pull_from_clone + pull_from_svn_clone ;; esac done @@ -169,11 +169,11 @@ done if [ ! -z "$ACTIONS" ]; then for action in $ACTIONS; do if [ "$action" == "pull" ]; then - fetch_svn + svn_fetch elif [ "$action" == "push" ]; then - push_to_clone + push_to_svn_clone elif [ "$action" == "commit" ]; then - dcommit + svn_dcommit fi done fi |