X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=blobdiff_plain;f=misc%2Ftools%2Fall%2Fconfig.subr;h=583da9de3c38d4614a4745ea96a95d2c61af7eb0;hp=cb07d15ea8c1f8e24f00e07c63fb6f6cdb8775f0;hb=HEAD;hpb=521c08406137d3ea1c92fcf401430306166c4b50

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index cb07d15e..68f092a2 100644
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -1,4 +1,5 @@
 devsite_url="http://dev.xonotic.org/"
+gitsite_url="http://gitlab.com/groups/xonotic/"
 
 allrepos()
 {
@@ -6,36 +7,54 @@ allrepos()
 	"$@" data/xonotic-data.pk3dir      xonotic-data.pk3dir.git      master         ""
 	"$@" data/xonotic-music.pk3dir     xonotic-music.pk3dir.git     master         ""
 	"$@" data/xonotic-nexcompat.pk3dir xonotic-nexcompat.pk3dir.git master         "no"
-	"$@" darkplaces                    darkplaces.git               div0-stable    "svn"
+	"$@" data/xonotic-xoncompat.pk3dir xonotic-xoncompat.pk3dir.git main           "no"
+	"$@" darkplaces                    darkplaces.git               master         ""
 	"$@" netradiant                    netradiant.git               master         ""
 	"$@" div0-gittools                 div0-gittools.git            master         "no"
 	"$@" d0_blind_id                   d0_blind_id.git              master         ""
 	"$@" data/xonotic-maps.pk3dir      xonotic-maps.pk3dir.git      master         ""
 	"$@" mediasource                   mediasource.git              master         "no"
-	"$@" gmqcc                         gmqcc.git                    master         ""
+	"$@" gmqcc                         gmqcc.git                    main           ""
 	"$@" xonstat                       xonstat.git                  master         "no"
 	"$@" xonstatdb                     xonstatdb.git                master         "no"
+	"$@" xonotic.org                   xonotic.org.git              master         "no"
+	"$@" wiki                          xonotic.wiki.git             master         "no"
 }
 
 allmirrors()
 {
+	# Legacy git URLs.
 	"$@" git  ''   git://git.xonotic.org/xonotic/      ''
 	"$@" http ''   http://git.xonotic.org/xonotic/     ''
 	"$@" ssh  ''   ssh://xonotic@git.xonotic.org/      ''
+	"$@" git  ''   git://nl.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://nl.git.xonotic.org/xonotic/  ''
+	"$@" git  ''   git://us.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
-	"$@" git  us   git://us.git.xonotic.org/xonotic/   '*2/3'
-	"$@" http us   http://us.git.xonotic.org/xonotic/  '*2/3'
+	# Gitlab host (divVerent).
+	"$@" http gitlab   https://gitlab.com/xonotic/     ''
 
-	"$@" git  de   git://de.git.xonotic.org/xonotic/   ''
-	"$@" http de   http://de.git.xonotic.org/xonotic/  ''
+	# German host - disabled (divVerent).
+	"$@" git  ''   git://de.git.xonotic.org/xonotic/   ''
+	"$@" http ''   http://de.git.xonotic.org/xonotic/  ''
 
-	"$@" git  nl   git://nl.git.xonotic.org/xonotic/   '*2'
-	"$@" http nl   http://nl.git.xonotic.org/xonotic/  '*2'
-
-	"$@" ssh  push ssh://xonotic@push.git.xonotic.org/ ''
+	# Pushing destination (authoritative server; merlijn).
+	"$@" ssh  push ssh://git@gitlab.com/xonotic/       ''
 }
 
-time=
-if { time -p sh -c 'true'; } 2>&1 >/dev/null | grep '^user ' >/dev/null; then
-	time="time -p"
+have_time=true
+measure_time()
+{
+	if $have_time; then
+		time -p "$@"
+	else
+		"$@"
+	fi
+}
+if { measure_time sh -c 'true'; } 2>&1 >/dev/null | grep '^user ' >/dev/null; then
+	msg "Timing via the time utility works."
+else
+	have_time=false
+	msg "Timing not supported."
 fi