[PATCH] Start adding the $GIT_DIR/remotes/ support.

All the necessary parsing code is in git-parse-remote-script;
update git-push-script to use it.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index ac4f2110dcab8a66a4808a92f569b1eaaa10b699..752affe407e3c90459846b2bb06dd0686a9b028f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-reset-script git-add-script git-checkout-script git-clone-script \
        gitk git-cherry git-rebase-script git-relink-script git-repack-script \
        git-format-patch-script git-sh-setup-script git-push-script \
-       git-branch-script git-parse-remote git-verify-tag-script \
+       git-branch-script git-parse-remote git-parse-remote-script git-verify-tag-script \
        git-ls-remote-script git-clone-dumb-http git-rename-script \
        git-request-pull-script git-bisect-script
 

diff --git a/git-parse-remote-script b/git-parse-remote-script
new file mode 100755 (executable)
index 0000000..2da7ae8
--- /dev/null
+++ b/git-parse-remote-script
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+. git-sh-setup-script || die "Not a git archive"
+
+get_data_source () {
+       case "$1" in
+       */*)
+               # Not so fast.  This could be the partial URL shorthand...
+               token=$(expr "$1" : '\([^/]*\)/')
+               remainder=$(expr "$1" : '[^/]*/\(.*\)')
+               if test -f "$GIT_DIR/branches/$token"
+               then
+                       echo branches-partial
+               else
+                       echo ''
+               fi
+               ;;
+       *)
+               if test -f "$GIT_DIR/remotes/$1"
+               then
+                       echo remotes
+               elif test -f "$GIT_DIR/branches/$1"
+               then
+                       echo branches
+               else
+                       echo ''
+               fi ;;
+       esac
+}
+
+get_remote_url () {
+       data_source=$(get_data_source "$1")
+       case "$data_source" in
+       '')
+               echo "$1" ;;
+       remotes)
+               sed -ne '/^URL: */{
+                       s///p
+                       q
+               }' "$GIT_DIR/remotes/$1" ;;
+       branches)
+               sed -e 's/#.*//' "$GIT_DIR/branches/$1" ;;
+       branches-partial)
+               token=$(expr "$1" : '\([^/]*\)/')
+               remainder=$(expr "$1" : '[^/]*/\(.*\)')
+               url=$(sed -e 's/#.*//' "$GIT_DIR/branches/$token")
+               echo "$url/$remainder"
+               ;;
+       *)
+               die "internal error: get-remote-url $1" ;;
+       esac
+}
+
+get_remote_default_refs_for_push () {
+       data_source=$(get_data_source "$1")
+       case "$data_source" in
+       '' | branches | branches-partial)
+               ;; # no default push mapping, just send matching refs.
+       remotes)
+               sed -ne '/^Push: */{
+                       s///p
+               }' "$GIT_DIR/remotes/$1" ;;
+       *)
+               die "internal error: get-remote-default-ref-for-push $1" ;;
+       esac
+}
+
+# Subroutine to canonicalize remote:local notation
+canon_refs_list_for_fetch () {
+       for ref
+       do
+               expr "$ref" : '.*:' >/dev/null || ref="${ref}:"
+               remote=$(expr "$ref" : '\([^:]*\):')
+               local=$(expr "$ref" : '[^:]*:\(.*\)')
+               case "$remote" in
+               '') remote=HEAD ;;
+               *) remote="refs/heads/$remote" ;;
+               esac
+               case "$local" in
+               '') local= ;;
+               *) local="refs/heads/$local" ;;
+               esac
+               echo "${remote}:${local}"
+       done
+}
+
+# Returns list of src: (no store), or src:dst (store)
+get_remote_default_refs_for_fetch () {
+       data_source=$(get_data_source "$1")
+       case "$data_source" in
+       '' | branches-partial)
+               echo "HEAD:" ;;
+       branches)
+               remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1")
+               case "$remote_branch" in '') remote_branch=master ;; esac
+               echo "refs/heads/${remote_branch}:refs/heads/$1"
+               ;;
+       remotes)
+               canon_refs_list_for_fetch $(sed -ne '/^Pull: */{
+                                               s///p
+                                       }' "$GIT_DIR/remotes/$1")
+               ;;
+       *)
+               die "internal error: get-remote-default-ref-for-push $1" ;;
+       esac
+}
+
+get_remote_refs_for_push () {
+       case "$#" in
+       0) die "internal error: get-remote-refs-for-push." ;;
+       1) get_remote_default_refs_for_push "$@" ;;
+       *) shift; echo "$@" ;;
+       esac
+}
+
+get_remote_refs_for_fetch () {
+       case "$#" in
+       0)
+           die "internal error: get-remote-refs-for-fetch." ;;
+       1)
+           get_remote_default_refs_for_fetch "$@" ;;
+       *)
+           shift
+           tag_just_seen=
+           for ref
+           do
+               if test "$tag_just_seen"
+               then
+                   echo "refs/tags/${ref}:refs/tags/${ref}"
+                   tag_just_seen=
+                   continue
+               else
+                   case "$ref" in
+                   tag)
+                       tag_just_seen=yes
+                       continue
+                       ;;
+                   esac
+               fi
+               canon_refs_list_for_fetch "$ref"
+           done
+           ;;
+       esac
+}

diff --git a/git-push-script b/git-push-script
index 70fa9684a51be3dbbcb83460c32bb8d7fe1b4cf0..5fa5af2af896e3bf6854387e744b9d2643a8f510 100755 (executable)
--- a/git-push-script
+++ b/git-push-script
@@ -20,8 +20,6 @@ do
        -*)
                die "Unknown parameter $1" ;;
         *)
-               remote="$1"
-               shift
                set x "$@"
                shift
                break ;;
@@ -29,27 +27,13 @@ do
        shift
 done
 
-case "$remote" in
-*:* | /* | ../* | ./* )
-       # An URL, host:/path/to/git, absolute and relative paths.
-       ;;
-* )
-       # Shorthand
-       if expr "$remote" : '..*/..*' >/dev/null
-       then
-               # a short-hand followed by a trailing path
-               shorthand=$(expr "$remote" : '\([^/]*\)')
-               remainder=$(expr "$remote" : '[^/]*\(/.*\)$')
-       else
-               shorthand="$remote"
-               remainder=
-       fi
-       remote=$(sed -e 's/#.*//' "$GIT_DIR/branches/$remote") &&
-       expr "$remote" : '..*:' >/dev/null &&
-       remote="$remote$remainder" ||
-       die "Cannot parse remote $remote"
-       ;;
+. git-parse-remote-script
+remote=$(get_remote_url "$@")
+case "$has_all" in
+--all) set x ;;
+'')    set x $(get_remote_refs_for_push "$@") ;;
 esac
+shift
 
 case "$remote" in
 http://* | https://* | git://* | rsync://* )