#!/bin/bash
-. "$(dirname $0)/common.sh" ""
+tools_dir=$(dirname "$0")
+. "$tools_dir/common.sh" ''
-origwd=$(pwd)
+if [ "$1" = '-n' ]; then
+ shift
+ last=$(tail -n1 "$SHA1_FILE" | cut -f1 -d"$_TAB")
+ start_from=$(get_branches | sed -n '/^'"$last"'$/{n;p;}')
+ if [ -z "$start_from" ]; then
+ exit 0
+ fi
+fi
+
+if [ "$1" = '-s' ]; then
+ shift
+ start_from="$1"
+ if [ -z "$start_from" ]; then
+ printf '-s requires a start tree\n' 1>&2
+ exit 1
+ fi
+ shift
+fi
-get_field()
+# shellcheck disable=SC2317
+fetch_git()
{
- grep -v '^#' $CTRL_FILE |
- awk -F '\t' '$3 == "'$1'" { print $'$2'; }'
+ local name="$1" branch="$2" old_sha="$3" new_sha
+
+ if ! new_sha=$(git ls-remote "$name" "refs/heads/$branch") ||
+ [ -z "$new_sha" ]; then
+ printf '%s: Could not fetch %s branch %s\n' 'fetch_git' "$name" "$branch" >&2
+ printf '%s\n' "$old_sha"
+ return
+ fi
+ new_sha="${new_sha%%"${_TAB}"*}"
+ if [ "$new_sha" = "$old_sha" ]; then
+ printf '%s\n' "$old_sha"
+ return
+ fi
+ if git fetch "$name"; then
+ git rev-parse --verify "$name/$branch"
+ else
+ printf '%s\n' "$old_sha"
+ fi
}
-trees="$@"
-[ "$trees" ] ||
- trees=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '{ print $3 }')
+trees="$*"
+if ! [ "$trees" ]; then
+ trees=$(get_branches)
+fi
for name in $trees; do
- type=$(get_field "$name" 2)
+ if [ -n "$start_from" ]; then
+ if [ "$name" = "$start_from" ]; then
+ start_from=''
+ else
+ continue
+ fi
+ fi
- echo $name: $type
- if [ "$type" = "git" ]; then
- git fetch "$name"
+ type=$(get_type "$name")
+ if ! [ "$type" ]; then
+ printf '%s: unknown tree\n' "$name" 1>&2
continue
fi
- if [ "$type" = "mmotm" ]; then
- cd ../mmotm || {
- echo "Cannot chdir to ../mmotm" 1>&2
- continue
- }
- rsync -avHPz --exclude .git --exclude broken-out.tar.gz --delete ozlabs.org::akpm/mmotm/. .
- # we only use the fist lines of {origin,linux-next}.patch
- [ -f broken-out/origin.patch ] &&
- sed -i 1q broken-out/origin.patch
- [ -f broken-out/linux-next.patch ] &&
- sed -i 1q broken-out/linux-next.patch
- git add -A .
- [ "$(git status --porcelain)" ] &&
- git commit -m "$(head -n 1 .DATE)"
- cd "$origwd"
+ if [ "$(get_url "$name")" = 'linux-next' ]; then
continue
fi
- if [ "$type" = "quilt" ]; then
- url=$(get_field "$name" 4)
- url=${url%/} # strip trailing / if necessary
-
- cd ../quilt || {
- echo "Cannot chdir to ../quilt" 1>&2
- continue
- }
- [ -d "$name" ] || mkdir "$name" || {
- echo "Cannot create quilt directory for $name" 1>&2
- cd "$origwd"
- continue
- }
- cd "$name" || {
- echo "Cannot chdir to quilt directory for $name" 1>&2
- cd "$origwd"
- continue
- }
- wget -N -nv --no-cache "$url/series" || {
- echo "Wget of $name series file failed" 1>&2
- cd ..
- rm -rf "$name"
- git checkout "$name"
- cd "$origwd"
- continue
- }
- find * -type f | grep -v '^series$' | sort >.series.old
- if grep -q NEXT_PATCHES series; then
- sed -n '/NEXT_PATCHES_START/,/NEXT_PATCHES_END/p' series
- else
- cat series
- fi |
- sed -e 's/[ \t]*#.*$//' -e '/^[ \t]*$/d' |
- sort >.series.next
- [ -s .series.next ] && {
- sed "s|^|$url/|" .series.next |
- wget -N -nv --no-cache -i - || {
- echo "Wget of series '$name' failed" 1>&2
- cd ..
- rm -rf "$name"
- git checkout "$name"
- cd "$origwd"
- continue
- }
- }
- comm -23 .series.old .series.next | xargs -r rm -f
- rm -f .series.old .series.next
- cd "$origwd"
+ printf '%s: %s\n' "$name" "$type"
+ fun="fetch_$type"
+ tfun=$(type -t "$fun")
+ if [ "$tfun" = 'function' ]; then
+ branch=$(get_remote_branch "$name")
+ old_sha=$(git rev-parse --quiet --verify "$name/$branch")
+ new_sha=$("$fun" "$name" "$branch" "$old_sha")
+ check_dups "$name" origin/master "$new_sha"
+ if ! [ "$new_sha" = "$old_sha" ]; then
+ "$tools_dir"/check_commits ^origin/master "$old_sha..$new_sha"
+ fi
fi
done
-cd ../quilt
-git add -A .
-git commit -v -a -m "$(date '+%F-%H:%M')" -e
-
exit 0