Merge commit 'junio/next' into next
[git/platforms/storm.git] / git-submodule.sh
blob100737210de3c76682ab3803626a36328fb27ca1
1 #!/bin/sh
3 # git-submodules.sh: add, init, update or list git submodules
5 # Copyright (c) 2007 Lars Hjemli
7 USAGE="[--quiet] [--cached] \
8 [add <repo> [-b branch]|status|init|update [-i|--init]|summary [-n|--summary-limit <n>] [<commit>]] \
9 [--] [<path>...]"
10 OPTIONS_SPEC=
11 . git-sh-setup
12 require_work_tree
14 command=
15 branch=
16 quiet=
17 cached=
20 # print stuff on stdout unless -q was specified
22 say()
24 if test -z "$quiet"
25 then
26 echo "$@"
30 # NEEDSWORK: identical function exists in get_repo_base in clone.sh
31 get_repo_base() {
33 cd "`/bin/pwd`" &&
34 cd "$1" || cd "$1.git" &&
36 cd .git
37 pwd
39 ) 2>/dev/null
42 # Resolve relative url by appending to parent's url
43 resolve_relative_url ()
45 branch="$(git symbolic-ref HEAD 2>/dev/null)"
46 remote="$(git config branch.${branch#refs/heads/}.remote)"
47 remote="${remote:-origin}"
48 remoteurl="$(git config remote.$remote.url)" ||
49 die "remote ($remote) does not have a url in .git/config"
50 url="$1"
51 while test -n "$url"
53 case "$url" in
54 ../*)
55 url="${url#../}"
56 remoteurl="${remoteurl%/*}"
58 ./*)
59 url="${url#./}"
62 break;;
63 esac
64 done
65 echo "$remoteurl/$url"
69 # Map submodule path to submodule name
71 # $1 = path
73 module_name()
75 # Do we have "submodule.<something>.path = $1" defined in .gitmodules file?
76 re=$(printf '%s' "$1" | sed -e 's/[].[^$\\*]/\\&/g')
77 name=$( git config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
78 sed -n -e 's|^submodule\.\(.*\)\.path '"$re"'$|\1|p' )
79 test -z "$name" &&
80 die "No submodule mapping found in .gitmodules for path '$path'"
81 echo "$name"
85 # Clone a submodule
87 # Prior to calling, cmd_update checks that a possibly existing
88 # path is not a git repository.
89 # Likewise, cmd_add checks that path does not exist at all,
90 # since it is the location of a new submodule.
92 module_clone()
94 path=$1
95 url=$2
97 # If there already is a directory at the submodule path,
98 # expect it to be empty (since that is the default checkout
99 # action) and try to remove it.
100 # Note: if $path is a symlink to a directory the test will
101 # succeed but the rmdir will fail. We might want to fix this.
102 if test -d "$path"
103 then
104 rmdir "$path" 2>/dev/null ||
105 die "Directory '$path' exist, but is neither empty nor a git repository"
108 test -e "$path" &&
109 die "A file already exist at path '$path'"
111 git-clone -n "$url" "$path" ||
112 die "Clone of '$url' into submodule path '$path' failed"
116 # Add a new submodule to the working tree, .gitmodules and the index
118 # $@ = repo [path]
120 # optional branch is stored in global branch variable
122 cmd_add()
124 # parse $args after "submodule ... add".
125 while test $# -ne 0
127 case "$1" in
128 -b | --branch)
129 case "$2" in '') usage ;; esac
130 branch=$2
131 shift
133 -q|--quiet)
134 quiet=1
137 shift
138 break
141 usage
144 break
146 esac
147 shift
148 done
150 repo=$1
151 path=$2
153 if test -z "$repo"; then
154 usage
157 # Guess path from repo if not specified or strip trailing slashes
158 if test -z "$path"; then
159 path=$(echo "$repo" | sed -e 's|/*$||' -e 's|:*/*\.git$||' -e 's|.*[/:]||g')
160 else
161 path=$(echo "$path" | sed -e 's|/*$||')
164 git ls-files --error-unmatch "$path" > /dev/null 2>&1 &&
165 die "'$path' already exists in the index"
167 # perhaps the path exists and is already a git repo, else clone it
168 if test -e "$path"
169 then
170 if test -d "$path/.git" &&
171 test "$(unset GIT_DIR; cd $path; git rev-parse --git-dir)" = ".git"
172 then
173 echo "Adding existing repo at '$path' to the index"
174 else
175 die "'$path' already exists and is not a valid git repo"
177 else
178 case "$repo" in
179 ./*|../*)
180 # dereference source url relative to parent's url
181 realrepo="$(resolve_relative_url $repo)" ;;
183 # Turn the source into an absolute path if
184 # it is local
185 if base=$(get_repo_base "$repo"); then
186 repo="$base"
188 realrepo=$repo
190 esac
192 module_clone "$path" "$realrepo" || exit
193 (unset GIT_DIR; cd "$path" && git checkout -q ${branch:+-b "$branch" "origin/$branch"}) ||
194 die "Unable to checkout submodule '$path'"
197 git add "$path" ||
198 die "Failed to add submodule '$path'"
200 git config -f .gitmodules submodule."$path".path "$path" &&
201 git config -f .gitmodules submodule."$path".url "$repo" &&
202 git add .gitmodules ||
203 die "Failed to register submodule '$path'"
207 # Register submodules in .git/config
209 # $@ = requested paths (default to all)
211 cmd_init()
213 # parse $args after "submodule ... init".
214 while test $# -ne 0
216 case "$1" in
217 -q|--quiet)
218 quiet=1
221 shift
222 break
225 usage
228 break
230 esac
231 shift
232 done
234 git ls-files --stage -- "$@" | grep '^160000 ' |
235 while read mode sha1 stage path
237 # Skip already registered paths
238 name=$(module_name "$path") || exit
239 url=$(git config submodule."$name".url)
240 test -z "$url" || continue
242 url=$(git config -f .gitmodules submodule."$name".url)
243 test -z "$url" &&
244 die "No url found for submodule path '$path' in .gitmodules"
246 # Possibly a url relative to parent
247 case "$url" in
248 ./*|../*)
249 url="$(resolve_relative_url "$url")"
251 esac
253 git config submodule."$name".url "$url" ||
254 die "Failed to register url for submodule path '$path'"
256 say "Submodule '$name' ($url) registered for path '$path'"
257 done
261 # Update each submodule path to correct revision, using clone and checkout as needed
263 # $@ = requested paths (default to all)
265 cmd_update()
267 # parse $args after "submodule ... update".
268 while test $# -ne 0
270 case "$1" in
271 -q|--quiet)
272 quiet=1
274 -i|--init)
275 shift
276 cmd_init "$@" || return
279 shift
280 break
283 usage
286 break
288 esac
289 shift
290 done
292 git ls-files --stage -- "$@" | grep '^160000 ' |
293 while read mode sha1 stage path
295 name=$(module_name "$path") || exit
296 url=$(git config submodule."$name".url)
297 if test -z "$url"
298 then
299 # Only mention uninitialized submodules when its
300 # path have been specified
301 test "$#" != "0" &&
302 say "Submodule path '$path' not initialized"
303 say "Maybe you want to use 'update --init'?"
304 continue
307 if ! test -d "$path"/.git -o -f "$path"/.git
308 then
309 module_clone "$path" "$url" || exit
310 subsha1=
311 else
312 subsha1=$(unset GIT_DIR; cd "$path" &&
313 git rev-parse --verify HEAD) ||
314 die "Unable to find current revision in submodule path '$path'"
317 if test "$subsha1" != "$sha1"
318 then
319 (unset GIT_DIR; cd "$path" && git-fetch &&
320 git-checkout -q "$sha1") ||
321 die "Unable to checkout '$sha1' in submodule path '$path'"
323 say "Submodule path '$path': checked out '$sha1'"
325 done
328 set_name_rev () {
329 revname=$( (
330 unset GIT_DIR
331 cd "$1" && {
332 git describe "$2" 2>/dev/null ||
333 git describe --tags "$2" 2>/dev/null ||
334 git describe --contains "$2" 2>/dev/null ||
335 git describe --all --always "$2"
338 test -z "$revname" || revname=" ($revname)"
341 # Show commit summary for submodules in index or working tree
343 # If '--cached' is given, show summary between index and given commit,
344 # or between working tree and given commit
346 # $@ = [commit (default 'HEAD'),] requested paths (default all)
348 cmd_summary() {
349 summary_limit=-1
350 for_status=
352 # parse $args after "submodule ... summary".
353 while test $# -ne 0
355 case "$1" in
356 --cached)
357 cached="$1"
359 --for-status)
360 for_status="$1"
362 -n|--summary-limit)
363 if summary_limit=$(($2 + 0)) 2>/dev/null && test "$summary_limit" = "$2"
364 then
366 else
367 usage
369 shift
372 shift
373 break
376 usage
379 break
381 esac
382 shift
383 done
385 test $summary_limit = 0 && return
387 if rev=$(git rev-parse --verify "$1^0" 2>/dev/null)
388 then
389 head=$rev
390 shift
391 else
392 head=HEAD
395 cd_to_toplevel
396 # Get modified modules cared by user
397 modules=$(git diff-index $cached --raw $head -- "$@" |
398 grep -e '^:160000' -e '^:[0-7]* 160000' |
399 while read mod_src mod_dst sha1_src sha1_dst status name
401 # Always show modules deleted or type-changed (blob<->module)
402 test $status = D -o $status = T && echo "$name" && continue
403 # Also show added or modified modules which are checked out
404 GIT_DIR="$name/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
405 echo "$name"
406 done
409 test -z "$modules" && return
411 git diff-index $cached --raw $head -- $modules |
412 grep -e '^:160000' -e '^:[0-7]* 160000' |
413 cut -c2- |
414 while read mod_src mod_dst sha1_src sha1_dst status name
416 if test -z "$cached" &&
417 test $sha1_dst = 0000000000000000000000000000000000000000
418 then
419 case "$mod_dst" in
420 160000)
421 sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
423 100644 | 100755 | 120000)
424 sha1_dst=$(git hash-object $name)
426 000000)
427 ;; # removed
429 # unexpected type
430 echo >&2 "unexpected mode $mod_dst"
431 continue ;;
432 esac
434 missing_src=
435 missing_dst=
437 test $mod_src = 160000 &&
438 ! GIT_DIR="$name/.git" git-rev-parse --verify $sha1_src^0 >/dev/null 2>&1 &&
439 missing_src=t
441 test $mod_dst = 160000 &&
442 ! GIT_DIR="$name/.git" git-rev-parse --verify $sha1_dst^0 >/dev/null 2>&1 &&
443 missing_dst=t
445 total_commits=
446 case "$missing_src,$missing_dst" in
448 errmsg=" Warn: $name doesn't contain commit $sha1_src"
451 errmsg=" Warn: $name doesn't contain commit $sha1_dst"
453 t,t)
454 errmsg=" Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
457 errmsg=
458 total_commits=$(
459 if test $mod_src = 160000 -a $mod_dst = 160000
460 then
461 range="$sha1_src...$sha1_dst"
462 elif test $mod_src = 160000
463 then
464 range=$sha1_src
465 else
466 range=$sha1_dst
468 GIT_DIR="$name/.git" \
469 git log --pretty=oneline --first-parent $range | wc -l
471 total_commits=" ($(($total_commits + 0)))"
473 esac
475 sha1_abbr_src=$(echo $sha1_src | cut -c1-7)
476 sha1_abbr_dst=$(echo $sha1_dst | cut -c1-7)
477 if test $status = T
478 then
479 if test $mod_dst = 160000
480 then
481 echo "* $name $sha1_abbr_src(blob)->$sha1_abbr_dst(submodule)$total_commits:"
482 else
483 echo "* $name $sha1_abbr_src(submodule)->$sha1_abbr_dst(blob)$total_commits:"
485 else
486 echo "* $name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
488 if test -n "$errmsg"
489 then
490 # Don't give error msg for modification whose dst is not submodule
491 # i.e. deleted or changed to blob
492 test $mod_dst = 160000 && echo "$errmsg"
493 else
494 if test $mod_src = 160000 -a $mod_dst = 160000
495 then
496 limit=
497 test $summary_limit -gt 0 && limit="-$summary_limit"
498 GIT_DIR="$name/.git" \
499 git log $limit --pretty='format: %m %s' \
500 --first-parent $sha1_src...$sha1_dst
501 elif test $mod_dst = 160000
502 then
503 GIT_DIR="$name/.git" \
504 git log --pretty='format: > %s' -1 $sha1_dst
505 else
506 GIT_DIR="$name/.git" \
507 git log --pretty='format: < %s' -1 $sha1_src
509 echo
511 echo
512 done |
513 if test -n "$for_status"; then
514 echo "# Modified submodules:"
515 echo "#"
516 sed -e 's|^|# |' -e 's|^# $|#|'
517 else
522 # List all submodules, prefixed with:
523 # - submodule not initialized
524 # + different revision checked out
526 # If --cached was specified the revision in the index will be printed
527 # instead of the currently checked out revision.
529 # $@ = requested paths (default to all)
531 cmd_status()
533 # parse $args after "submodule ... status".
534 while test $# -ne 0
536 case "$1" in
537 -q|--quiet)
538 quiet=1
540 --cached)
541 cached=1
544 shift
545 break
548 usage
551 break
553 esac
554 shift
555 done
557 git ls-files --stage -- "$@" | grep '^160000 ' |
558 while read mode sha1 stage path
560 name=$(module_name "$path") || exit
561 url=$(git config submodule."$name".url)
562 if test -z "$url" || ! test -d "$path"/.git -o -f "$path"/.git
563 then
564 say "-$sha1 $path"
565 continue;
567 set_name_rev "$path" "$sha1"
568 if git diff-files --quiet -- "$path"
569 then
570 say " $sha1 $path$revname"
571 else
572 if test -z "$cached"
573 then
574 sha1=$(unset GIT_DIR; cd "$path" && git rev-parse --verify HEAD)
575 set_name_rev "$path" "$sha1"
577 say "+$sha1 $path$revname"
579 done
582 # This loop parses the command line arguments to find the
583 # subcommand name to dispatch. Parsing of the subcommand specific
584 # options are primarily done by the subcommand implementations.
585 # Subcommand specific options such as --branch and --cached are
586 # parsed here as well, for backward compatibility.
588 while test $# != 0 && test -z "$command"
590 case "$1" in
591 add | init | update | status | summary)
592 command=$1
594 -q|--quiet)
595 quiet=1
597 -b|--branch)
598 case "$2" in
600 usage
602 esac
603 branch="$2"; shift
605 --cached)
606 cached="$1"
609 break
612 usage
615 break
617 esac
618 shift
619 done
621 # No command word defaults to "status"
622 test -n "$command" || command=status
624 # "-b branch" is accepted only by "add"
625 if test -n "$branch" && test "$command" != add
626 then
627 usage
630 # "--cached" is accepted only by "status" and "summary"
631 if test -n "$cached" && test "$command" != status -a "$command" != summary
632 then
633 usage
636 "cmd_$command" "$@"