now we also support ./all clean -FFFFFFFFFFFFFFFFFUUUUUUUUUUUUUUUU which does nothing

[xonotic/xonotic.git] / all

diff --git a/all b/all
index b73d5f1bc61c033269e82a15408973069b076d39..ecf385bbf28056cd7ae7303e8c3582852d5126fd 100755 (executable)
--- a/all
+++ b/all
@@ -110,17 +110,17 @@ enter()
 }
 
 repos_urls="
-.                             |                                                   | master      |
-data/xonotic-data.pk3dir      |                                                   | master      |
-data/xonotic-music.pk3dir     |                                                   | master      |
-data/xonotic-nexcompat.pk3dir |                                                   | master      | no
-darkplaces                    |                                                   | div0-stable | svn
-netradiant                    |                                                   | master      |
-div0-gittools                 |                                                   | master      | no
-d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
-data/xonotic-maps.pk3dir      |                                                   | master      |
-mediasource                   |                                                   | master      | no
-fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
+.                             |                                                   | master         |
+data/xonotic-data.pk3dir      |                                                   | master         |
+data/xonotic-music.pk3dir     |                                                   | master         |
+data/xonotic-nexcompat.pk3dir |                                                   | master         | no
+darkplaces                    |                                                   | div0-stable    | svn
+netradiant                    |                                                   | master         |
+div0-gittools                 |                                                   | master         | no
+d0_blind_id                   |                                                   | master         |
+data/xonotic-maps.pk3dir      |                                                   | master         |
+mediasource                   |                                                   | master         | no
+fteqcc                        |                                                   | xonotic-stable | noautocrlf
 "
 # todo: in darkplaces, change repobranch to div0-stable
 
@@ -308,7 +308,14 @@ fix_git_config()
                verbose git config --unset remote.origin.pushurl || true
        fi
        verbose git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-       verbose git config core.autocrlf input
+       case ",`repoflags "$d"`," in
+               *,noautocrlf,*)
+                       verbose git config --unset core.autocrlf || true
+                       ;;
+               *)
+                       verbose git config core.autocrlf input
+                       ;;
+       esac
        if [ -z "`git config push.default || true`" ]; then
                verbose git config push.default current # or is tracking better?
        fi
@@ -1039,6 +1046,12 @@ case "$cmd" in
                        reportecho "$o"
                }
                for d in $repos; do
+                       case "$d" in
+                               fteqcc)
+                                       # sorry, fteqcc repo is managed manually
+                                       continue
+                                       ;;
+                       esac
                        enter "$d0/$d" verbose
                        base="`repobranch "$d"`"
                        reportecho "In $d:"
@@ -1122,6 +1135,11 @@ case "$cmd" in
                                                                reportecho4 "--> test failed, postponed"
                                                        fi
                                                else
+                                                       # apply crlf, or other cleanup filters (non-behavioural changes)
+                                                       git reset --hard
+                                                       find . -type f -exec touch {} \;
+                                                       git commit -a --amend -C HEAD || true # don't fail if nothing to commit
+
                                                        echo "MERGING"
                                                        case ",`repoflags "$d"`," in
                                                                *,svn,*)
@@ -1203,6 +1221,17 @@ case "$cmd" in
                                rmuntracked=true
                        elif [ x"$X" = x"-D" ]; then
                                killbranches=true
+                       elif echo "$X" | grep '^-FFFF*UUUU*$' >/dev/null; then
+                               msg '        _____'
+                               msg '    ,--'\''-\P/`\  FFFFFFF'
+                               msg ' __/_    B/,-.\  FFFFFFF'
+                               msg ' /  _\  (//  O\\  FFFFFF'
+                               msg '| (O  `) _\._ _)\  FFFUU'
+                               msg '| |___/.^d0~~"\  \ UUUU'
+                               msg '|     |`~'\''     \ |  UUUU'
+                               msg '|     |    __,C>|| UUUU'
+                               msg '\    /_ ,-/,-'\''   |  UUUU'
+                               msg ' \\_ \_>~'\''      /  UUUU-'
                        else
                                break
                        fi