@matheusbsbs / matheus-bagliano / commits / b74e8cbd80
Fork 0

git-fetch: split fetch_main into fetch_dumb and fetch_native

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

Junio C Hamano committed Jan 15, 2007 at 22:56 UTC b74e8cbd80c13257c8c0a68341e9aff9926d31f2
1 file changed +105 -69
git-fetch.sh
+105 -69
@@ -268,7 +268,101 @@ then
268 fi
269 fi
270
271 -fetch_main () {
271 +fetch_native () {
272 + reflist="$1"
273 + refs=
274 + rref=
275 +
276 + for ref in $reflist
277 + do
278 + refs="$refs$LF$ref"
279 +
280 + # These are relative path from $GIT_DIR, typically starting at refs/
281 + # but may be HEAD
282 + if expr "z$ref" : 'z\.' >/dev/null
283 + then
284 + not_for_merge=t
285 + ref=$(expr "z$ref" : 'z\.\(.*\)')
286 + else
287 + not_for_merge=
288 + fi
289 + if expr "z$ref" : 'z+' >/dev/null
290 + then
291 + single_force=t
292 + ref=$(expr "z$ref" : 'z+\(.*\)')
293 + else
294 + single_force=
295 + fi
296 + remote_name=$(expr "z$ref" : 'z\([^:]*\):')
297 + local_name=$(expr "z$ref" : 'z[^:]*:\(.*\)')
298 +
299 + rref="$rref$LF$remote_name"
300 + done
301 +
302 + ( : subshell because we muck with IFS
303 + IFS=" $LF"
304 + (
305 + git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref ||
306 + echo failed "$remote"
307 + ) |
308 + (
309 + trap '
310 + if test -n "$keepfile" && test -f "$keepfile"
311 + then
312 + rm -f "$keepfile"
313 + fi
314 + ' 0
315 +
316 + keepfile=
317 + while read sha1 remote_name
318 + do
319 + case "$sha1" in
320 + failed)
321 + echo >&2 "Fetch failure: $remote"
322 + exit 1 ;;
323 + # special line coming from index-pack with the pack name
324 + pack)
325 + continue ;;
326 + keep)
327 + keepfile="$GIT_OBJECT_DIRECTORY/pack/pack-$remote_name.keep"
328 + continue ;;
329 + esac
330 + found=
331 + single_force=
332 + for ref in $refs
333 + do
334 + case "$ref" in
335 + +$remote_name:*)
336 + single_force=t
337 + not_for_merge=
338 + found="$ref"
339 + break ;;
340 + .+$remote_name:*)
341 + single_force=t
342 + not_for_merge=t
343 + found="$ref"
344 + break ;;
345 + .$remote_name:*)
346 + not_for_merge=t
347 + found="$ref"
348 + break ;;
349 + $remote_name:*)
350 + not_for_merge=
351 + found="$ref"
352 + break ;;
353 + esac
354 + done
355 + local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
356 + append_fetch_head "$sha1" "$remote" \
357 + "$remote_name" "$remote_nick" "$local_name" \
358 + "$not_for_merge" || exit
359 + done
360 + )
361 + ) || exit
362 +
363 +}
364 +
365 +fetch_dumb () {
366 reflist="$1"
367 refs=
368 rref=
@@ -360,9 +454,6 @@ fetch_main () {
454 rsync_slurped_objects=t
455 }
456 ;;
363 - *)
364 - # We will do git native transport with just one call later.
365 - continue ;;
457 esac
458
459 append_fetch_head "$head" "$remote" \
@@ -370,72 +461,17 @@ fetch_main () {
461
462 done
463
373 - case "$remote" in
374 - http://* | https://* | ftp://* | rsync://* )
375 - ;; # we are already done.
376 - *)
377 - ( : subshell because we muck with IFS
378 - IFS=" $LF"
379 - (
380 - git-fetch-pack --thin $exec $keep $shallow_depth "$remote" $rref ||
381 - echo failed "$remote"
382 - ) |
383 - (
384 - trap '
385 - if test -n "$keepfile" && test -f "$keepfile"
386 - then
387 - rm -f "$keepfile"
388 - fi
389 - ' 0
390 -
391 - keepfile=
392 - while read sha1 remote_name
393 - do
394 - case "$sha1" in
395 - failed)
396 - echo >&2 "Fetch failure: $remote"
397 - exit 1 ;;
398 - # special line coming from index-pack with the pack name
399 - pack)
400 - continue ;;
401 - keep)
402 - keepfile="$GIT_OBJECT_DIRECTORY/pack/pack-$remote_name.keep"
403 - continue ;;
404 - esac
405 - found=
406 - single_force=
407 - for ref in $refs
408 - do
409 - case "$ref" in
410 - +$remote_name:*)
411 - single_force=t
412 - not_for_merge=
413 - found="$ref"
414 - break ;;
415 - .+$remote_name:*)
416 - single_force=t
417 - not_for_merge=t
418 - found="$ref"
419 - break ;;
420 - .$remote_name:*)
421 - not_for_merge=t
422 - found="$ref"
423 - break ;;
424 - $remote_name:*)
425 - not_for_merge=
426 - found="$ref"
427 - break ;;
428 - esac
429 - done
430 - local_name=$(expr "z$found" : 'z[^:]*:\(.*\)')
431 - append_fetch_head "$sha1" "$remote" \
432 - "$remote_name" "$remote_nick" "$local_name" \
433 - "$not_for_merge" || exit
434 - done
435 - )
436 - ) || exit ;;
437 - esac
464 +}
465
466 +fetch_main () {
467 + case "$remote" in
468 + http://* | https://* | ftp://* | rsync://* )
469 + fetch_dumb "$@"
470 + ;;
471 + *)
472 + fetch_native "$@"
473 + ;;
474 + esac
475 }
476
477 fetch_main "$reflist" || exit