X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=fetch_trees;h=2db70cdb77e15bf0ba00ff54dda4a7bbf0447c24;hb=HEAD;hp=d163bba6835fe914cb23dd85ff746c5cf8c06c38;hpb=c1f240407ab16bb5cd4544424209a8cea9b5947a;p=next-scripts

diff --git a/fetch_trees b/fetch_trees
index d163bba..2db70cd 100755
--- a/fetch_trees
+++ b/fetch_trees
@@ -1,21 +1,34 @@
 #!/bin/bash
 
-[ "$1" = "-s" ] && {
+tools_dir=$(dirname "$0")
+# shellcheck source=/dev/null
+. "$tools_dir/common.sh" ''
+
+if [ "$1" = '-n' ]; then
+	shift
+	last=$(tail -n1 "$SHA1_FILE" | cut -f1 -d$'\t')
+	start_from=$(awk -F '\t' '/^[^#]/ && $3 == "'"$last"'" {
+		do
+			getline;
+		while (/^#/ || $2 == "branch");
+		print $3;
+		exit 0;
+	}' "$CTRL_FILE")
+fi
+
+if [ "$1" = '-s' ]; then
 	shift
 	start_from="$1"
-	[ -z "$start_from" ] && {
-		echo "-s requires a start tree" 1>&2
+	if [ -z "$start_from" ]; then
+		printf '-s requires a start tree\n' 1>&2
 		exit 1
-	}
+	fi
 	shift
-}
-
-. "$(dirname $0)/common.sh" ""
+fi
 
 get_field()
 {
-	grep -v '^#' $CTRL_FILE |
-		awk -F '\t' '$3 == "'$1'" { print $'$2'; }'
+	awk -F '\t' '/^[^#]/ && $3 == "'"$1"'" { print $'"$2"'; }' "$CTRL_FILE"
 }
 
 fetch_git()
@@ -24,94 +37,50 @@ fetch_git()
 }
 
 fetch_mmotm()
-{
-	(
-		cd ../mmotm || {
-			echo "Cannot chdir to ../mmotm" 1>&2
-			return
-		}
-		rsync -az --partial --exclude .git\* --exclude broken-out.tar.gz --delete ozlabs.org::akpm/mmotm/. . || {
-			git reset --hard
-			echo "Fetcing mmotm failed" 1>&2
-			return
-		}
-		git add -A .
-		[ "$(git status --porcelain)" ] &&
-			git commit -m "$(head -n 1 .DATE)"
-	)
-}
+(
+	if ! cd ../mmotm; then
+		printf 'Cannot chdir to ../mmotm\n' 1>&2
+		return
+	fi
+	if ! rsync -az --partial --exclude '.git*' \
+			--exclude broken-out.tar.gz --delete \
+			gandalf.ozlabs.org::akpm/mmotm/. .; then
+		git reset --hard
+		printf 'Fetcing mmotm failed\n' 1>&2
+		return
+	fi
+	git add -A .
+	if [ "$(git status --porcelain)" ]; then
+		git commit -m "$(head -n 1 .DATE)"
+	fi
+)
 
-fetch_quilt()
-{
-	(
-		url=$(get_field "$1" 4)
-		url=${url%/}	# strip trailing / if necessary
-
-		cd ../quilt || {
-			echo "Cannot chdir to ../quilt" 1>&2
-			return
-		}
-		[ -d "$1" ] || mkdir "$1" || {
-			echo "Cannot create quilt directory for $1" 1>&2
-			return
-		}
-		cd "$1" || {
-			echo "Cannot chdir to quilt directory for $1" 1>&2
-			return
-		}
-		wget -N -nv --no-cache "$url/series" || {
-			echo "Wget of $1 series file failed" 1>&2
-			cd ..
-			rm -rf "$1"
-			git checkout "$1"
-			return
-		}
-		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 ] && {
-			wget -N -nv --no-cache -B "$url/" -i .series.next || {
-				echo "Wget of series '$1' failed" 1>&2
-				cd ..
-				rm -rf "$1"
-				git checkout "$1"
-				return
-			}
-		}
-		comm -23 .series.old .series.next | xargs -r rm -f
-		rm -f .series.old .series.next
-		setfattr -x user.xdg.origin.url * >/dev/null 2>&1
-	)
-}
-
-trees="$@"
-[ "$trees" ] ||
-	trees=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '{ print $3 }')
+trees="$*"
+if ! [ "$trees" ]; then
+	trees=$(awk -F '\t' '/^[^#]/ && $2 != "branch" { print $3 }' "$CTRL_FILE")
+fi
 
 for name in $trees; do
-	[ -n "$start_from" ] && {
+	if [ -n "$start_from" ]; then
 		if [ "$name" = "$start_from" ]; then
-			start_from=""
+			start_from=''
 		else
 			continue
 		fi
-	}
+	fi
 
 	type=$(get_field "$name" 2)
+	if ! [ "$type" ]; then
+		printf '%s: unknown tree\n' "$name" 1>&2
+		continue
+	fi
 
-	echo $name: $type
-	[ $(type -t "fetch_$type") = "function" ] &&
-		fetch_$type "$name"
+	printf '%s: %s\n' "$name" "$type"
+	fun="fetch_$type"
+	tfun=$(type -t "$fun")
+	if [ "$tfun" = 'function' ]; then
+		"$fun" "$name"
+	fi
 done
 
-cd ../quilt
-git add -A .
-[ "$(git status --porcelain)" ] &&
-	git commit -v -a -m "$(date '+%F-%H:%M')" -e
-
 exit 0