From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Nov 2012 00:49:28 +0000 (+1100)
Subject: remove some old files
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=6c562f3b9a0dfa9646fe3032585e57e241a825c3;p=next-scripts

remove some old files
---

diff --git a/check_trees b/check_trees
deleted file mode 100755
index 92e13d1..0000000
--- a/check_trees
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-id=$(git rev-parse x86-fixes/for-linus)
-base=$(git merge-base x86-fixes/for-linus x86/for-akpm)
-[ "$id" = "$base" ] || {
-	echo x86-fixes/for-linus not base for x86/for-akpm 1>&2
-	exit 1
-}
-
-id=$(git rev-parse x86/for-akpm)
-base=$(git merge-base x86/for-akpm x86-latest/latest)
-[ "$id" = "$base" ] || {
-	echo x86/for-akpm not base for x86-latest/latest 1>&2
-	exit 1
-}
-
-id=$(git rev-parse sched-fixes/for-linus)
-base=$(git merge-base sched-fixes/for-linus sched/for-akpm)
-[ "$id" = "$base" ] || {
-	echo sched-fixes/for-linus not base for sched/for-akpm 1>&2
-	exit 1
-}
-
-id=$(git rev-parse sched/for-akpm)
-base=$(git merge-base sched/for-akpm sched-latest/latest)
-[ "$id" = "$base" ] || {
-	echo sched/for-akpm not base for sched-latest/latest 1>&2
-	exit 1
-}
-
-#id=$(git rev-parse x86-fixes/for-linus)
-#base=$(git merge-base x86-fixes/for-linus sched-fixes/for-linus)
-#[ "$id" = "$base" ] || {
-#	echo x86-fixes/for-linus not base for sched-fixes/for-linus 1>&2
-#	exit 1
-#}
-
-#id=$(git rev-parse x86/for-akpm)
-#base=$(git merge-base x86/for-akpm sched/for-akpm)
-#[ "$id" = "$base" ] || {
-#	echo x86/for-akpm not base for sched/for-akpm 1>&2
-#	exit 1
-#}
-
-id=$(git rev-parse x86-latest/latest)
-base=$(git merge-base x86-latest/latest sched-latest/latest)
-[ "$id" = "$base" ] || {
-	echo x86-latest/latest not base for sched-latest/latest 1>&2
-	exit 1
-}
-
diff --git a/rebase_end b/rebase_end
deleted file mode 100755
index eabf618..0000000
--- a/rebase_end
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-LOG_FILE="../merge.log"
-build_host="ka2"
-build_dir="/scratch/sfr/next"
-build_cmd="bin/build_next"
-
-no_build=false
-[ "$1" = "-n" ] && {
-	shift
-	no_build=true
-}
-[ -n "$1" ] && build_host="$1"
-
-log()
-{
-	echo "$@" | tee -a $LOG_FILE
-}
-
-execute()
-{
-	log "$" $@
-	$@ 2>&1 | tee -a $LOG_FILE
-	return ${PIPESTATUS[0]}
-}
-
-execute git checkout master || {
-	echo "git checkout failed" 1>&2
-	exit
-}
-GIT_EDITOR=: execute git merge temp || {
-	echo merge failed 1>&2
-	bash -i || exit
-}
-execute git branch -d temp
-
-$no_build && exit 0
-
-rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
-	echo Rsync failed 1>&2
-	bash -i || exit
-}
-
-echo "Building using $build_cmd on $build_host"
-ssh "$build_host" "$build_cmd" || {
-	echo Build failed 1>&2
-	bash -i || exit
-}
-
-exit 0
diff --git a/rebase_on b/rebase_on
deleted file mode 100755
index ebf1847..0000000
--- a/rebase_on
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-LOG_FILE="../merge.log"
-
-no_build=false
-[ "$1" = "-n" ] && {
-	shift
-	no_build=true
-}
-tree="$1"
-base="$2"
-
-log()
-{
-	echo "$@" | tee -a $LOG_FILE
-}
-
-execute()
-{
-	log "$" $@
-	$@ 2>&1 | tee -a $LOG_FILE
-	return ${PIPESTATUS[0]}
-}
-
-execute git checkout -b temp "$tree" || {
-	echo "git checkout failed" 1>&2
-	exit
-}
-log '$' git rebase --onto master "$base"
-git rebase --onto master "$base"
-
-exit 0
diff --git a/summary b/summary
deleted file mode 100755
index a0488bd..0000000
--- a/summary
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash --norc
-
-d="$1"
-prev="$2"
-
-LOG_FILE="../stats/next-$d-summary"
-
-cp /dev/null $LOG_FILE
-
-log()
-{
-	echo "$@" | tee -a $LOG_FILE
-}
-
-plog()
-{
-	printf "$@" | tee -a $LOG_FILE
-}
-
-patch_and_sha_ids()
-{
-	for id in $*; do
-		git diff-tree -p "$id" | git patch-id | head -n 1
-	done | sort
-}
-
-patch_ids()
-{
-	patch_and_sha_ids "$@" | cut -d' ' -f1
-}
-
-trees=$(grep -v '^#' ../real_control | awk -F '	' '{ printf("%s ", $3); }')
-
-seen_ids=""
-seen_heads=""
-seen_sha1s=""
-total_commits=0
-total_diff=0
-
-plog '%-20s %7s' "Tree" "commits"
-[ "$prev" ] &&
-	plog '\t%s' "change since next-$prev"
-plog '\n\n'
-
-for t in $trees; do
-
-	[ "$t" = "origin" ] &&
-		continue
-
-	[ "$prev" ] && {
-		prev_num=$(egrep "^$t +[0-9]+" "../stats/next-$prev-summary")
-		if [ "$prev_num" ]; then
-			prev_num=$(expr "$prev_num" : "[^ ]*  *\([0-9]*\).*")
-		else
-			prev_num=0
-		fi
-	}
-
-	h="refs/next/$d/$t"
-	git rev-parse --verify "$h" >/dev/null 2>&1 ||
-		continue
-
-	mb=$(git merge-base "refs/next/$d/origin" $h)
-	rh=$(git rev-parse $h)
-	[ "$mb" = "$rh" ] && {
-		plog '%-20s %7d' $t 0
-		[ "$prev" ] && {
-			plog '\t\t%+7d' $((0 - prev_num))
-			total_diff=$((total_diff - prev_num))
-		}
-		plog '\n'
-		continue
-	}
-
-	c=$(git rev-list --no-merges $mb...$rh $seen_heads | sort)
-	seen_heads="$seen_heads ^$rh"
-	[ -z "$c" ] && {
-		plog '%-20s %7d' $t 0
-		[ "$prev" ] && {
-			plog '\t\t%+7d' $((0 - prev_num))
-			total_diff=$((total_diff - prev_num))
-		}
-		plog '\n'
-		continue
-	}
-
-#	origin_ids=$(patch_ids $(git rev-list --no-merges $mb..origin/master))
-
-	is=$(patch_and_sha_ids $c)
-#	is=$(join -v 1 <(echo "$is") <(echo "$origin_ids"))
-	is=$(echo "$is" | join -v 1 - "../stats/origin-$d.ids")
-	is=$(join -v 1 <(echo "$is") <(echo "$seen_ids"))
-	c1=$(echo "$is" | cut -d' ' -f2)
-	[ "$is" ] &&
-		seen_ids=$( (echo "$seen_ids"; echo "$is" | cut -d' ' -f1) | sort)
-
-	seen_sha1s="$seen_sha1s $c1"
-
-#	log $t \($(echo "$c" | wc -w) $(echo "$c1" | wc -w)\)
-	num=$(echo "$c1" | wc -w)
-	plog '%-20s %7d' $t $num
-	[ "$prev" ] && {
-		plog '\t\t%+7d' $((num - prev_num))
-		total_diff=$((total_diff + num - prev_num))
-	}
-	plog '\n'
-
-	total_commits=$((total_commits + num))
-done
-
-log
-plog '%-20s %7d' 'Total' $total_commits
-[ "$prev" ] &&
-	plog '\t\t%+7d' $total_diff
-plog '\n'
-
-log
-git shortlog --no-walk $seen_sha1s 2>&1 | tee -a $LOG_FILE
-
-exit 0