remove support for quilt trees

diff --git a/do_clean b/do_clean
index ab23480da18681065e6648e49280ea52b9532c3b..054edc40980d6d518956bbc2c7588b9a4836b0cf 100755 (executable)
--- a/do_clean
+++ b/do_clean
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RM_FILES="last_msg.bak merge.debug merge.log quilt-import.log"
+RM_FILES="last_msg.bak merge.debug merge.log"
 OTHER_RM_FILES="mails/* akpm-import.log"
 MV_FILES="summ"
 

diff --git a/do_merge b/do_merge
index b0caba0b42a7043e6f0fb9dae340f0530f3e7ad1..806fc67a502179ab1b019176f6890a796e2b82e4 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -56,7 +56,7 @@ fi
 
 heads=$(awk -F '\t' '
        /^#/ { next; }
-       $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }
+       $2=="git" { printf("%s/%s ", $3, $5); }
        $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
 
 need_build=false

diff --git a/do_stats b/do_stats
index 5a0be99ec30f4a2ca3b036873097469d07163991..3a4c4e821ca7143fa122f511a03848c31afd9d04 100755 (executable)
--- a/do_stats
+++ b/do_stats
@@ -125,6 +125,5 @@ Top ten commiters:
 $(git log --no-walk --stdin --pretty="format:%cE" <$sd/$next.sha1s.3 |
        tr 'A-Z' 'a-z' | sort | uniq -c | sort -nr | head -n 10)
 
-Those commits by me are from the quilt series (mainly Andrew's mmotm
-tree).
+Those commits by me are from Andrew's mmotm tree.
 EOF

diff --git a/fetch_trees b/fetch_trees
index 74c75848344269c18f4dfcd2637d0bdf32ab8613..997f6d33688bc1194458af8d222b1707a0a86f09 100755 (executable)
--- a/fetch_trees
+++ b/fetch_trees
@@ -55,51 +55,6 @@ fetch_mmotm()
        fi
 )
 
-fetch_quilt()
-(
-       url=$(get_field "$1" 4)
-       url=${url%/}    # strip trailing / if necessary
-
-       if ! cd ../quilt; then
-               printf 'Cannot chdir to ../quilt\n' 1>&2
-               return
-       fi
-       if ! [ -d "$1" ] && ! mkdir "$1"; then
-               printf 'Cannot create quilt directory for %s\n' "$1" 1>&2
-               return
-       fi
-       if ! cd "$1"; then
-               printf 'Cannot chdir to quilt directory for %s\n' "$1" 1>&2
-               return
-       fi
-       if ! wget -N -nv --no-cache --no-xattr "$url/series"; then
-               printf 'Wget of %s series file failed\n' "$1" 1>&2
-               cd ..
-               rm -rf "$1"
-               git checkout "$1"
-               return
-       fi
-       find . -type f | sed 's,^./,,;/^series$/d' | 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
-       if [ -s .series.next ]; then
-               if ! wget -N -nv --no-cache --no-xattr -B "$url/" -i .series.next; then
-                       printf 'Wget of series %s failed\n' "$1" 1>&2
-                       cd ..
-                       rm -rf "$1"
-                       git checkout "$1"
-                       return
-               fi
-       fi
-       comm -23 .series.old .series.next | xargs -r rm -f
-       rm -f .series.old .series.next
-)
-
 trees="$*"
 if ! [ "$trees" ]; then
        trees=$(awk -F '\t' '/^[^#]/ && $2 != "branch" { print $3 }' "$CTRL_FILE")
@@ -128,13 +83,4 @@ for name in $trees; do
        fi
 done
 
-if ! cd ../quilt; then
-       printf 'hmmm, what happened to the quilt directory?\n' 1>&2
-       exit 1
-fi
-git add -A .
-if [ "$(git status --porcelain)" ]; then
-       git commit -v -a -m "$(date '+%F-%H:%M')" -e
-fi
-
 exit 0

diff --git a/make_tree_file b/make_tree_file
index 66373bfcea5b69f75d6d8d4743966328af361e19..43473c27154955da4c09b5bcd957d680b996ff52 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -40,9 +40,7 @@ mkdir Next
 
 mv ../SHA1s Next/SHA1s
 
-for i in quilt-import.log merge.log; do
-       grep -v '^Checking out files:' ../$i >Next/$i
-done
+grep -v '^Checking out files:' ../merge.log >Next/merge.log
 
 printf -- "-next-%s\n" $d >localversion-next
 

diff --git a/to_ozlabs b/to_ozlabs
index c40170fcc7552e0f41777bc051e36321211cf9a7..e1d30c801d0b9e985476de761b7d3228a74564c7 100755 (executable)
--- a/to_ozlabs
+++ b/to_ozlabs
@@ -19,7 +19,6 @@ done
 - gitk.cache
 - /merge.debug
 - /merge.log
-- /quilt-import.log
 - /akpm-import.log
 - /summ
 - /patch-*-next-2*

diff --git a/update_trees b/update_trees
deleted file mode 100755 (executable)
index b09a01a..0000000
--- a/update_trees
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-
-. "$(dirname $0)/common.sh"
-
-log_file=../quilt-import.log
-#cp /dev/null $log_file
-
-log()
-{
-       echo "$@" | tee -a $log_file
-}
-
-execute()
-{
-       log "$" $@
-       "$@" 2>&1 | tee -a $log_file
-       [ ${PIPESTATUS[0]} -eq 0 ] || $SHELL -i || exit 1
-}
-
-cpwd=$(pwd)
-
-quilters=$(awk -F '\t' '/^[^#]/ && $2=="quilt" { print $3; }' "$CTRL_FILE")
-
-for name in $quilters; do
-
-       sfile="../quilt/$name/series"
-       base=$(sed -n 's/^#[ \t]*NEXT[-_]BASE[ \t]*\([^ \t]*\)[ \t]*$/\1/p' "$sfile")
-       if [ -n "$base" ]; then
-               nbase=$(awk -F '\t' '/^[^#]/ && $3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }' "$CTRL_FILE")
-               [ -n "$nbase" ] && base="$nbase"
-       else
-               base=$(sed -n 's/^#[ \t]*BASE[ \t]*\(.*\)[ \t]*$/\1/p' "$sfile")
-               [ -n "$base" ] || {
-                       # for stgit
-                       base=$(sed '1{s/^#.*GIT commit \(.*\)$/\1/;q}' "$sfile")
-                       [ -n "$base" ] ||
-                               base="origin/master"
-               }
-       fi
-       rbase="$base"
-       case "$base" in
-       *-git[0-9]*)    rbase=$("$bin_dir/get_gitid" "${base}")
-                       ;;
-       commit*)        rbase=${base##commit*[[:space:]]}
-                       ;;
-       [0-9]*.*)       rbase="v$base"
-                       ;;
-       esac
-       log "Importing $name based on $base"
-       rbase_sha1=$(git rev-parse --verify "$rbase^{commit}") || {
-               log "Unknown BASE"
-               continue
-       }
-
-       # don't bother importing things that haven't changed
-       mb=$(git merge-base "$rbase_sha1" "$name/master")
-       change_size=$(cd ../quilt;git diff last_merge.. -- "$name/" | wc -c)
-       [ "$mb" = "$rbase_sha1" ] && [ $change_size -eq 0 ] && {
-               log "Unchanged quilt series $name"
-               continue
-       }
-
-       sed_exp='s/[ \t]*#.*$//;/^[ \t]*$/!p'
-       grep -q NEXT_PATCHES "$sfile" &&
-               sed_exp='/NEXT_PATCHES_START/,/NEXT_PATCHES_END/{'"$sed_exp"';}'
-       patches=$(sed -n "$sed_exp" "$sfile")
-
-       git show-ref --quiet --verify "refs/heads/$name/master" ||
-               execute git branch "$name/master" "$rbase_sha1"
-
-       [ -n "$patches" ] || {
-               log "   quilt series is empty"
-               execute git branch -f "$name/master" "$rbase_sha1"
-               continue
-       }
-
-       [ -d "../quilt-tmp" ] ||
-               execute git clone -s -l -n -q . ../quilt-tmp
-
-       log '$' cd ../quilt-tmp
-       cd ../quilt-tmp
-       execute git reset --hard "$rbase_sha1"
-
-       for f in $patches; do
-               old_head=$(git rev-parse --verify HEAD)
-               execute git am -s --patch-format=mbox "../quilt/$name/$f"
-               new_head=$(git rev-parse --verify HEAD)
-               [ "$new_head" = "$old_head" ] && {
-                       echo "Tree unchanged, please check ..."
-                       bash -i || exit
-               }
-       done
-
-       log '$' cd $cpwd
-       cd $cpwd
-
-       execute git fetch -f ../quilt-tmp master:"$name/master"
-done
-
-[ -d "../quilt-tmp" ] &&
-       rm -rf ../quilt-tmp
-
-( cd ../quilt; git branch -f last_merge HEAD )
-
-exit 0