xdl_merge(): fix and simplify conflict handling
[git] / git-parse-remote.sh
1 #!/bin/sh
2
3 # git-ls-remote could be called from outside a git managed repository;
4 # this would fail in that case and would issue an error message.
5 GIT_DIR=$(git-rev-parse --git-dir 2>/dev/null) || :;
6
7 get_data_source () {
8         case "$1" in
9         */*)
10                 # Not so fast.  This could be the partial URL shorthand...
11                 token=$(expr "z$1" : 'z\([^/]*\)/')
12                 remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
13                 if test "$(git-repo-config --get "remote.$token.url")"
14                 then
15                         echo config-partial
16                 elif test -f "$GIT_DIR/branches/$token"
17                 then
18                         echo branches-partial
19                 else
20                         echo ''
21                 fi
22                 ;;
23         *)
24                 if test "$(git-repo-config --get "remote.$1.url")"
25                 then
26                         echo config
27                 elif test -f "$GIT_DIR/remotes/$1"
28                 then
29                         echo remotes
30                 elif test -f "$GIT_DIR/branches/$1"
31                 then
32                         echo branches
33                 else
34                         echo ''
35                 fi ;;
36         esac
37 }
38
39 get_remote_url () {
40         data_source=$(get_data_source "$1")
41         case "$data_source" in
42         '')
43                 echo "$1" ;;
44         config-partial)
45                 token=$(expr "z$1" : 'z\([^/]*\)/')
46                 remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
47                 url=$(git-repo-config --get "remote.$token.url")
48                 echo "$url/$remainder"
49                 ;;
50         config)
51                 git-repo-config --get "remote.$1.url"
52                 ;;
53         remotes)
54                 sed -ne '/^URL: */{
55                         s///p
56                         q
57                 }' "$GIT_DIR/remotes/$1" ;;
58         branches)
59                 sed -e 's/#.*//' "$GIT_DIR/branches/$1" ;;
60         branches-partial)
61                 token=$(expr "z$1" : 'z\([^/]*\)/')
62                 remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
63                 url=$(sed -e 's/#.*//' "$GIT_DIR/branches/$token")
64                 echo "$url/$remainder"
65                 ;;
66         *)
67                 die "internal error: get-remote-url $1" ;;
68         esac
69 }
70
71 get_default_remote () {
72         curr_branch=$(git-symbolic-ref HEAD | sed -e 's|^refs/heads/||')
73         origin=$(git-repo-config --get "branch.$curr_branch.remote")
74         echo ${origin:-origin}
75 }
76
77 get_remote_default_refs_for_push () {
78         data_source=$(get_data_source "$1")
79         case "$data_source" in
80         '' | config-partial | branches | branches-partial)
81                 ;; # no default push mapping, just send matching refs.
82         config)
83                 git-repo-config --get-all "remote.$1.push" ;;
84         remotes)
85                 sed -ne '/^Push: */{
86                         s///p
87                 }' "$GIT_DIR/remotes/$1" ;;
88         *)
89                 die "internal error: get-remote-default-ref-for-push $1" ;;
90         esac
91 }
92
93 # Called from canon_refs_list_for_fetch -d "$remote", which
94 # is called from get_remote_default_refs_for_fetch to grok
95 # refspecs that are retrieved from the configuration, but not
96 # from get_remote_refs_for_fetch when it deals with refspecs
97 # supplied on the command line.  $ls_remote_result has the list
98 # of refs available at remote.
99 expand_refs_wildcard () {
100         for ref
101         do
102                 lref=${ref#'+'}
103                 # a non glob pattern is given back as-is.
104                 expr "z$lref" : 'zrefs/.*/\*:refs/.*/\*$' >/dev/null || {
105                         echo "$ref"
106                         continue
107                 }
108
109                 from=`expr "z$lref" : 'z\(refs/.*/\)\*:refs/.*/\*$'`
110                 to=`expr "z$lref" : 'zrefs/.*/\*:\(refs/.*/\)\*$'`
111                 local_force=
112                 test "z$lref" = "z$ref" || local_force='+'
113                 echo "$ls_remote_result" |
114                 (
115                         IFS='   '
116                         while read sha1 name
117                         do
118                                 mapped=${name#"$from"}
119                                 if test "z$name" != "z${name#'^{}'}" ||
120                                         test "z$name" = "z$mapped"
121                                 then
122                                         continue
123                                 fi
124                                 echo "${local_force}${name}:${to}${mapped}"
125                         done
126                 )
127         done
128 }
129
130 # Subroutine to canonicalize remote:local notation.
131 canon_refs_list_for_fetch () {
132         # If called from get_remote_default_refs_for_fetch
133         # leave the branches in branch.${curr_branch}.merge alone,
134         # or the first one otherwise; add prefix . to the rest
135         # to prevent the secondary branches to be merged by default.
136         merge_branches=
137         if test "$1" = "-d"
138         then
139                 shift ; remote="$1" ; shift
140                 if test "$remote" = "$(get_default_remote)"
141                 then
142                         curr_branch=$(git-symbolic-ref HEAD | \
143                             sed -e 's|^refs/heads/||')
144                         merge_branches=$(git-repo-config \
145                             --get-all "branch.${curr_branch}.merge")
146                 fi
147                 set x $(expand_refs_wildcard "$@")
148                 shift
149         fi
150         for ref
151         do
152                 force=
153                 case "$ref" in
154                 +*)
155                         ref=$(expr "z$ref" : 'z+\(.*\)')
156                         force=+
157                         ;;
158                 esac
159                 expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
160                 remote=$(expr "z$ref" : 'z\([^:]*\):')
161                 local=$(expr "z$ref" : 'z[^:]*:\(.*\)')
162                 dot_prefix=.
163                 if test -z "$merge_branches"
164                 then
165                         merge_branches=$remote
166                         dot_prefix=
167                 else
168                         for merge_branch in $merge_branches
169                         do
170                             [ "$remote" = "$merge_branch" ] &&
171                             dot_prefix= && break
172                         done
173                 fi
174                 case "$remote" in
175                 '') remote=HEAD ;;
176                 refs/heads/* | refs/tags/* | refs/remotes/*) ;;
177                 heads/* | tags/* | remotes/* ) remote="refs/$remote" ;;
178                 *) remote="refs/heads/$remote" ;;
179                 esac
180                 case "$local" in
181                 '') local= ;;
182                 refs/heads/* | refs/tags/* | refs/remotes/*) ;;
183                 heads/* | tags/* | remotes/* ) local="refs/$local" ;;
184                 *) local="refs/heads/$local" ;;
185                 esac
186
187                 if local_ref_name=$(expr "z$local" : 'zrefs/\(.*\)')
188                 then
189                    git-check-ref-format "$local_ref_name" ||
190                    die "* refusing to create funny ref '$local_ref_name' locally"
191                 fi
192                 echo "${dot_prefix}${force}${remote}:${local}"
193         done
194 }
195
196 # Returns list of src: (no store), or src:dst (store)
197 get_remote_default_refs_for_fetch () {
198         data_source=$(get_data_source "$1")
199         case "$data_source" in
200         '' | config-partial | branches-partial)
201                 echo "HEAD:" ;;
202         config)
203                 canon_refs_list_for_fetch -d "$1" \
204                         $(git-repo-config --get-all "remote.$1.fetch") ;;
205         branches)
206                 remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1")
207                 case "$remote_branch" in '') remote_branch=master ;; esac
208                 echo "refs/heads/${remote_branch}:refs/heads/$1"
209                 ;;
210         remotes)
211                 canon_refs_list_for_fetch -d "$1" $(sed -ne '/^Pull: */{
212                                                 s///p
213                                         }' "$GIT_DIR/remotes/$1")
214                 ;;
215         *)
216                 die "internal error: get-remote-default-ref-for-push $1" ;;
217         esac
218 }
219
220 get_remote_refs_for_push () {
221         case "$#" in
222         0) die "internal error: get-remote-refs-for-push." ;;
223         1) get_remote_default_refs_for_push "$@" ;;
224         *) shift; echo "$@" ;;
225         esac
226 }
227
228 get_remote_refs_for_fetch () {
229         case "$#" in
230         0)
231             die "internal error: get-remote-refs-for-fetch." ;;
232         1)
233             get_remote_default_refs_for_fetch "$@" ;;
234         *)
235             shift
236             tag_just_seen=
237             for ref
238             do
239                 if test "$tag_just_seen"
240                 then
241                     echo "refs/tags/${ref}:refs/tags/${ref}"
242                     tag_just_seen=
243                     continue
244                 else
245                     case "$ref" in
246                     tag)
247                         tag_just_seen=yes
248                         continue
249                         ;;
250                     esac
251                 fi
252                 canon_refs_list_for_fetch "$ref"
253             done
254             ;;
255         esac
256 }
257
258 resolve_alternates () {
259         # original URL (xxx.git)
260         top_=`expr "z$1" : 'z\([^:]*:/*[^/]*\)/'`
261         while read path
262         do
263                 case "$path" in
264                 \#* | '')
265                         continue ;;
266                 /*)
267                         echo "$top_$path/" ;;
268                 ../*)
269                         # relative -- ugly but seems to work.
270                         echo "$1/objects/$path/" ;;
271                 *)
272                         # exit code may not be caught by the reader.
273                         echo "bad alternate: $path"
274                         exit 1 ;;
275                 esac
276         done
277 }